aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-10-27Merge branch 'maint-0.2.2_secfix' into master_secfixSebastian Hahn
Conflicts: src/common/tortls.c src/or/connection_or.c src/or/dirserv.c src/or/or.h
2011-10-26Add option to give guard flag to relays without the CVE-2011-2768 fixRobert Ransom
This way, all of the DA operators can upgrade immediately, without nuking every client's set of entry guards as soon as a majority of them upgrade. Until enough guards have upgraded, a majority of dirauths should set this config option so that there are still enough guards in the network. After a few days pass, all dirauths should use the default.
2011-10-26Don't give the Guard flag to relays without the CVE-2011-2768 fixRobert Ransom
2011-10-26Make tor_version_same_series non-staticRobert Ransom
2011-10-26Merge branch 'maint-0.2.1_secfix' into maint-0.2.2_secfixSebastian Hahn
Conflicts: src/or/connection_or.c
2011-10-26Reject create cells on outgoing OR connections from bridgesRobert Ransom
2011-10-26Mark which OR connections are outgoingRobert Ransom
2011-10-26Don't use any OR connection which sent us a CREATE_FAST cell for an EXTENDRobert Ransom
Fix suggested by Nick Mathewson.
2011-10-26Don't send a certificate chain on outgoing TLS connections from non-relaysNick Mathewson
2011-10-26Merge branch 'maint-0.2.2'Roger Dingledine
2011-10-26Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
2011-10-26Remove the -F option from tor-resolve.Nick Mathewson
It used to mean "Force": it would tell tor-resolve to ask tor to resolve an address even if it ended with .onion. But when AutomapHostsOnResolve was added, automatically refusing to resolve .onion hosts stopped making sense. So in 0.2.1.16-rc (commit 298dc95dfd8), we made tor-resolve happy to resolve anything. The -F option stayed in, though, even though it didn't do anything. Oddly, it never got documented. Found while fixing GCC 4.6 "set, unused variable" warnings.
2011-10-26manually backport a5232e0c4cRoger Dingledine
2011-10-26Merge branch 'maint-0.2.2'Roger Dingledine
2011-10-26Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
2011-10-26closer to a changelog for the next alphaRoger Dingledine
2011-10-26stop asserting at bootRoger Dingledine
The patch for 3228 made us try to run init_keys() before we had loaded our state file, resulting in an assert inside init_keys. We had moved it too early in the function. Now it's later in the function, but still above the accounting calls.
2011-10-26Reinit keys at the start of options_act().Nick Mathewson
Previously we did this nearer to the end (in the old_options && transition_affects_workers() block). But other stuff cares about keys being consistent with options... particularly anything which tries to access a key, which can die in assert_identity_keys_ok(). Fixes bug 3228; bugfix on 0.2.2.18-alpha. Conflicts: src/or/config.c
2011-10-26Don't crash a bridge authority on SIGHUP if it's not in the consensusRobert Ransom
Fixes bug 2572.
2011-10-26Fix 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. Conflicts: src/or/config.c
2011-10-26Merge branch 'cov_run224_squashed'Nick Mathewson
2011-10-26Changelog for recent coverity issuesNick Mathewson
2011-10-26Fix memory leak in retry_all_listeners: Coverity CID 485Nick Mathewson
2011-10-26Fix memory leak in options_act_reversible: fix Coverity CID 486,487Nick Mathewson
2011-10-26Do not tread vpadding cell as versions cell. Not in any released version.Nick Mathewson
2011-10-26Fix a NULL pointer dereference in parse_server_transport_line().George Kadianakis
2011-10-26Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-10-26Merge remote-tracking branch 'public/cov_run224_022' into maint-0.2.2Nick Mathewson
2011-10-26Fix a couple of pluggable transport bugsSebastian Hahn
Fix coverity complaints 490, 491 and 492. Especially the one in parse_client_transport_line() could've been a remotely triggerable segfault, I think.
2011-10-26Don't crash when accountingmax is set in non-server TorsNick Mathewson
We use a hash of the identity key to seed a prng to tell when an accounting period should end. But thanks to the bug998 changes, clients no longer have server-identity keys to use as a long-term seed in accounting calculations. In any case, their identity keys (as used in TLS) were never never fixed. So we can just set the wakeup time from a random seed instead there. Still open is whether everybody should be random. This patch fixes bug 2235, which was introduced in 0.2.2.18-alpha. Diagnosed with help from boboper on irc.
2011-10-26Properly refcount client_identity_keySebastian Hahn
In a2bb0bf we started using a separate client identity key. When we are in "public server mode" (that means not a bridge) we will use the same key. Reusing the key without doing the proper refcounting leads to a segfault on cleanup during shutdown. Fix that. Also introduce an assert that triggers if our refcount falls below 0. That should never happen.
2011-10-26Add some asserts to get_{tlsclient|server}_identity_keyNick Mathewson
We now require that: - Only actual servers should ever call get_server_identity_key - If you're being a client or bridge, the client and server keys should differ. - If you're being a public relay, the client and server keys should be the same.
2011-10-26Rename get_client_identity_key to get_tlsclient_identity_keyNick Mathewson
2011-10-26Maintain separate server and client identity keys when appropriate.Robert Ransom
Fixes a bug described in ticket #988. Conflicts: src/or/main.c src/or/router.c
2011-10-26Make crypto_free_pk_env tolerate NULL arg in 0.2.1. Error-proofing against ↵Nick Mathewson
bug 988 backport
2011-10-26Maintain separate server and client TLS contexts.Robert Ransom
Fixes bug #988. Conflicts: src/or/main.c src/or/router.c
2011-10-26Refactor tor_tls_context_new:Robert Ransom
* Make tor_tls_context_new internal to tortls.c, and return the new tor_tls_context_t from it. * Add a public tor_tls_context_init wrapper function to replace it. Conflicts: src/or/main.c src/or/router.c
2011-10-26Add public_server_mode function.Robert Ransom
2011-10-26Merge branch 'maint-0.2.2'Roger Dingledine
2011-10-26Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
2011-10-26Fix zlib macro brokenness on osx with zlib 1.2.4 and higher.Nick Mathewson
From the code: zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory that nobody will care if the compile outputs a no-such-identifier warning. Sorry, but we like -Werror over here, so I guess we need to define these. I hope that zlib 1.2.6 doesn't break these too. Possible fix for bug 1526.
2011-10-25Merge branch 'maint-0.2.2'Roger Dingledine
2011-10-25unmangle the fingerprint example in the man pageRoger Dingledine
Remove a confusing dollar sign from the example fingerprint in the man page, and also make example fingerprint a valid one.
2011-10-25Merge branch 'ticket4294'Nick Mathewson
2011-10-25Avoid likely memory fragmentation from rep_hist_note_descs_servedNick Mathewson
When you're doing malloc(sizeof(int)), something may well have gone wrong. This technique is a bit abusive, but we're already relying on it working correctly in geoip.c.
2011-10-25Add percentiles to the desc stats reportingSebastian Hahn
To get a better idea what's going on on Tonga, add some code to report how often the most and least frequently fetched descriptor was fetched, as well as 25, 50, 75 percentile. Also ensure we only count bridge descriptors here.
2011-10-24Merge remote-tracking branch 'sebastian/bug4293'Nick Mathewson
2011-10-24Don't initialize desc stats for non-bridgedirauth nodesSebastian Hahn
Also make sure that calling rep_hist_note_desc_served() while stats aren't initialized just returns. Bug spotted by SwissTorHelp. Thanks!
2011-10-24checkpoint: fold in changes filesRoger Dingledine
2011-10-23bump to 0.2.3.5-alpha-devRoger Dingledine