torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,943 Commits 53 Branches 631 Tags
2eadbd41f0d0356898c75d7fab032109a85bc9e9
Commit Graph

8685 Commits

Author SHA1 Message Date
Nick Mathewson 2eadbd41f0 Merge remote branch 'sebastian/bug2496' 2011-02-22 14:17:11 -05:00
Nick Mathewson b7f201f746 Merge remote branch 'origin/maint-0.2.2' 
Conflicts:
	src/or/policies.c
	src/or/policies.h
 2011-02-22 14:10:42 -05:00
Nick Mathewson cdc59c198a Don't let bad DNS make exit policy and declared exit policy get out of sync 
Patch from "postman" on trac. Fixes bg 2366. Bug on 0.1.2.5-alpha.
 2011-02-22 14:06:28 -05:00
Nick Mathewson 46b07462ae Merge remote branch 'origin/maint-0.2.2' 2011-02-22 13:02:42 -05:00
Nick Mathewson 9d5873cdae Merge branch 'log_domains' into maint-0.2.2 2011-02-22 13:01:02 -05:00
Nick Mathewson ce149c1022 That shalt also not have a label without a statement. 2011-02-22 12:52:52 -05:00
Nick Mathewson 933ffd536d Merge remote branch 'origin/maint-0.2.2' 2011-02-22 12:47:47 -05:00
Nick Mathewson 613073e449 Merge remote branch 'sebastian/bug2504' into maint-0.2.2 2011-02-22 12:47:21 -05:00
Nick Mathewson eb403b4696 Tweak some names and comments in asn's heartbeat patch 2011-02-22 12:41:22 -05:00
George Kadianakis ee95430d39 Implement more heartbeat message stuff. 
(This squashes multiple commits:

* Adds uptime monitoring support.
* Adds circuit counting code.
* Trivially tweaks the documentation.
* Trivial run_scheduled_events() code tweaking.
* Adds a status.h to export functions.
* Added bandwidth monitoring code.
* Added consensus presense detection code.
* Restricts the precision of the bandwidth output.
* Various fixes.
* Fixed style and spacing problems.
* Tidied up src/or/Makefile.am
* Couple of minor fixes on status.c functions.
* 'Implemented' client heartbeat support
)
 2011-02-22 12:40:38 -05:00
Sebastian Hahn 098b6ba72d Initial heartbeat subsystem commit. 
Sets:
* Documentation
* Logging domain
* Configuration option
* Scheduled event
* Makefile
It also creates status.c and the log_heartbeat() function.

All code was written by Sebastian Hahn. Commit message was
written by me (George Kadianakis).
 2011-02-22 12:40:36 -05:00
Nick Mathewson 0ba69714b4 Merge remote branch 'sebastian/bug2444' 2011-02-22 11:10:57 -05:00
Nick Mathewson d120ee1c63 Merge remote branch 'origin/maint-0.2.2' 2011-02-22 01:03:06 -05:00
Robert Ransom 444a955e4a Don't crash a bridge authority on SIGHUP if it's not in the consensus 
Fixes bug 2572.
 2011-02-16 04:12:37 -08:00
Sebastian Hahn 5dbaf9dbd5 Windows has EACCES, not EACCESS 
Once again spotted by mobmix

Also add a changes file for the fix
 2011-02-11 17:02:26 +01:00
Roger Dingledine 1c5b19a31a Merge branch 'maint-0.2.2' 2011-02-11 01:21:04 -05:00
Roger Dingledine 9b745cdbf9 Merge branch 'maint-0.2.1' into maint-0.2.2 2011-02-11 01:20:47 -05:00
Roger Dingledine 28de4d83fd fix the other half of bug 1074 2011-02-10 17:11:06 -05:00
Nick Mathewson 50c259d763 Make the DH parameter we use for TLS match the one from Apache's mod_ssl 
Our regular DH parameters that we use for circuit and rendezvous
crypto are unchanged.  This is yet another small step on the path of
protocol fingerprinting resistance.

(Backport from 0.2.2's 5ed73e3807)
 2011-02-10 15:55:06 -05:00
Nick Mathewson f1a004797e Merge remote-tracking branch 'origin/maint-0.2.2' 
Conflicts:
	doc/tor.1.txt
 2011-02-10 15:52:04 -05:00
Robert Ransom 449d895f06 Merge branch 'bug2408-v2-021-common' into bug2408-v2-022 2011-02-09 03:05:21 -08:00
Robert Ransom 7bf06d4a4f Ignore and warn about "PublishServerDescriptor hidserv" 
Fixes #2408.
 2011-02-09 02:33:24 -08:00
Nick Mathewson cc9809c1f7 Merge remote branch 'origin/maint-0.2.2' 2011-02-08 14:37:31 -05:00
Nick Mathewson d43470ad8a Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 2011-02-08 14:37:02 -05:00
Nick Mathewson f25fc6e650 Merge remote branch 'origin/maint-0.2.2' 2011-02-08 14:02:43 -05:00
Sebastian Hahn 9c7e2cf010 Locking failures on windows are indicated by EACCES 
Patch our implementation of tor_lockfile_lock() to handle this case
correctly. Also add a note that blocking behaviour differs from windows
to *nix. Fixes bug 2504, issue pointed out by mobmix.
 2011-02-08 18:35:07 +01:00
Roger Dingledine bcbcda309a move the clause above the "if bw is too low" check 2011-02-07 23:22:45 -05:00
Roger Dingledine 20b75989ac dtrt when only relaybandwidthburst is set 
fixes bug 2470
 2011-02-07 23:21:33 -05:00
Roger Dingledine 4b6b398cff Merge branch 'maint-0.2.2' 2011-02-07 22:21:01 -05:00
Roger Dingledine 54ccc80a4a Merge branch 'maint-0.2.1' into maint-0.2.2 2011-02-07 22:20:35 -05:00
Karsten Loesing 9c2cb6fc89 Update to the February 1 2011 Maxmind GeoLite Country database. 2011-02-07 22:19:37 -05:00
Nick Mathewson ff5810aea9 Merge remote branch 'origin/maint-0.2.2' 2011-02-07 12:47:04 -05:00
Nick Mathewson 98cef0ac1e Merge branch 'bug2279' into maint-0.2.2 2011-02-07 12:43:54 -05:00
Nick Mathewson e854e01d57 Some cleanups to bug2279 messages/docs from rransom 2011-02-07 12:40:43 -05:00
Roger Dingledine c2c1f5b2a1 another api tweak to help task 1944 2011-02-07 10:43:41 -05:00
Roger Dingledine d3836b02cc change APIs slightly to make #1944 easier 2011-02-07 06:39:21 -05:00
Sebastian Hahn 7736f44698 Don't tell Tor client users about missing geoip 
They don't need the geoip file for stats, so a missing geoipfile is not
a big issue. Also make the log message a bit friendlier. Fixes bug 2496.
 2011-02-06 00:27:47 +01:00
Nick Mathewson 69f7c0385b Merge remote branch 'origin/maint-0.2.2' for bug2203_rebased 
There was a merge conflict in routerlist.c due to the new node_t logic.

Conflicts:
	src/or/routerlist.c
 2011-02-04 12:26:59 -05:00
Nick Mathewson e9803aa710 Merge branch 'bug2203_rebased' into maint-0.2.2 2011-02-04 12:22:18 -05:00
Robert Ransom 0ab8b7c0f2 Thou shalt not overflow even stupidly small buffers 2011-02-04 05:50:44 -08:00
Nick Mathewson a6c811313a Merge remote branch 'origin/maint-0.2.2' 2011-02-03 14:21:14 -05:00
John Brooks 895409011f Enable ASLR and permanent DEP for Windows executables 
Fix for #2358
 2011-02-03 14:18:00 -05:00
Nick Mathewson 912b76a1bf Merge remote branch 'origin/maint-0.2.2' 2011-02-03 13:56:37 -05:00
Nick Mathewson 2fa9ddb958 Merge remote branch 'public/bug2378' into maint-0.2.2 2011-02-03 13:54:28 -05:00
Sebastian Hahn 490d397dbf Log which config file we read 
It is often not entirely clear what options Tor was built with, so it
might not be immediately obvious which config file Tor is using when it
found one. Log the config file at startup.
 2011-01-27 15:31:34 +01:00
Nick Mathewson 0337fc7b06 Merge remote branch 'origin/maint-0.2.2' 2011-01-26 11:49:41 -05:00
Nick Mathewson e6da9a98e9 Merge branch 'bug2181' into maint-0.2.2 2011-01-26 11:46:13 -05:00
Nick Mathewson d92a415bed Add an option to disable the block-private-addresses feature 
Suggested by rransom.  Probably necessary for testing network mode.
 2011-01-26 11:35:24 -05:00
Nick Mathewson a880429a76 Merge remote branch 'origin/maint-0.2.2' 2011-01-26 11:08:02 -05:00
Nick Mathewson ba3b03def0 Merge branch 'bug2409' into maint-0.2.2 2011-01-26 11:06:59 -05:00