summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-02-04Merge remote branch 'origin/maint-0.2.2' for bug2203_rebasedNick Mathewson
There was a merge conflict in routerlist.c due to the new node_t logic. Conflicts: src/or/routerlist.c
2011-02-04Merge branch 'bug2203_rebased' into maint-0.2.2Nick Mathewson
2011-02-03Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-02-03changes file for ASLR/DEP build on windowsNick Mathewson
2011-02-03Enable ASLR and permanent DEP for Windows executablesJohn Brooks
Fix for #2358
2011-02-03Merge maint-0.2.2: do not take manpage change from bug2450.Nick Mathewson
2011-02-03Merge remote branch 'sebastian/bug2450' into maint-0.2.2Nick Mathewson
2011-02-03Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-02-03Merge remote branch 'public/bug2378' into maint-0.2.2Nick Mathewson
2011-02-02tweak xxx-pluggable-transport based on comments from sjmurdochNick Mathewson
2011-01-31Proposal 176: proposed v3 handshakeNick Mathewson
2011-01-31Add suggestion by Nikita to Proposal 171Nick Mathewson
2011-01-28Remove country codes from EntryNodes manpage entrySebastian Hahn
2011-01-26Merge remote branch 'karsten/cbtdirspec'Nick Mathewson
2011-01-26Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-26Merge branch 'bug2181' into maint-0.2.2Nick Mathewson
2011-01-26Explain soft shutdown mode a little better in the accountingmax documentationNick Mathewson
2011-01-26Fix typo in dir-spec.txt [found by sebastian]Nick Mathewson
2011-01-26Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-26Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-01-26Merge-forward our exit-notice backport (empty merge)Nick Mathewson
2011-01-26fix the links in the exit-list notice we give out to users.Andrew Lewman
2011-01-26Backport current tor-exit-notice to 0.2.1Nick Mathewson
2011-01-26Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-26Merge branch 'bug2409' into maint-0.2.2Nick Mathewson
2011-01-26Merge branch 'bug2321' into maint-0.2.2Nick Mathewson
2011-01-26Avoid sketchy integer cast in cbt codeNick Mathewson
When calling circuit_build_times_shuffle_and_store_array, we were passing a uint32_t as an int. arma is pretty sure that this can't actually cause a bug, because of checks elsewhere in the code, but it's best not to pass a uint32_t as an int anyway. Found by doorss; fix on 0.2.2.4-alpha.
2011-01-25Log more about soft-hibernationNick Mathewson
2011-01-25Correctly detect BIO_new failuresNick Mathewson
This bug was noticed by cypherpunks; fixes bug 2378. Bugfix on svn commit r110.
2011-01-25Always treat failure to allocate an RSA key as an unrecoverable allocation errorNick Mathewson
2011-01-25Handle failing cases of DH allocationNick Mathewson
2011-01-25Remove an unused function in crypto.cNick Mathewson
2011-01-25Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-25Comment remaining CBT functions.Mike Perry
Left circuit_build_times_get_bw_scale() uncommented because it is in the wrong place due to an improper bug2317 fix. It needs to be moved and renamed, as it is not a cbt parameter.
2011-01-25Describe consensus method 11 in dir-spec.txtNick Mathewson
2011-01-25Add changelog entry for bug2203.Mike Perry
2011-01-25Fix authority side of 2203.Mike Perry
Do not add Exit bandwidth to E if BadExit is set.
2011-01-25Fix client side of 2203: Do not count BadExits as Exits.Mike Perry
2011-01-25Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-25Add changes file for bug2004Nick Mathewson
2011-01-25Fix bug #2004 by demoting a log message.Mike Perry
To quote arma: "So instead of stopping your CBT from screaming, you're just going to throw it in the closet and hope you can't hear it?" Yep. The log message can happen because at 95% point on the curve, we can be way beyond the max timeout we've seen, if the curve has few points and is shallow. Also applied Nick's rule of thumb for rewriting some other notice log messages to read like how you would explain them to a raving lunatic on #tor who was shouting at you demanding what they meant. Hopefully the changes live up to that standard.
2011-01-25Fix bug in verifying directory signatures with short digestsNick Mathewson
If we got a signed digest that was shorter than the required digest length, but longer than 20 bytes, we would accept it as long enough.... and then immediately fail when we want to check it. Fixes bug 2409; bug in 0.2.2.20-alpha; found by piebeer.
2011-01-25Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/geoip.c
2011-01-25Tell which geoip file we're parsingSebastian Hahn
2011-01-25Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-25Fix assert for relay/bridge state changeSebastian Hahn
When we added support for separate client tls certs on bridges in a2bb0bfdd5 we forgot to correctly initialize this when changing from relay to bridge or vice versa while Tor is running. Fix that by always initializing keys when the state changes. Fixes bug 2433.
2011-01-24Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-24Make the DH parameter we use for TLS match the one from Apache's mod_sslNick Mathewson
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.
2011-01-20Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-20Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion