aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Bump version to 0.2.3.6-alpha-devNick Mathewson2011-10-28
|
* Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-10-28
|\ | | | | | | | | Conflicts: src/or/command.c
| * Discard all cells on a marked connectionNick Mathewson2011-10-28
| | | | | | | | Fix for bug 4299
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-10-28
|\|
| * Fix typo, spotted by tmpname0901. Thanks!Sebastian Hahn2011-10-28
| |
* | Merge branch 'maint-0.2.2'Roger Dingledine2011-10-27
|\|
| * bump maint-0.2.2 to 0.2.2.34-devRoger Dingledine2011-10-27
| |
* | find all those stanzas in master tooRoger Dingledine2011-10-27
| |
* | Merge branch 'maint-0.2.2'Roger Dingledine2011-10-27
|\|
| * Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-10-27
| |\
| | * bump maint to 0.2.1.31Roger Dingledine2011-10-27
| | |
* | | a little blurb for 0.2.3.6-alphaRoger Dingledine2011-10-26
| | |
* | | forward-port the stable releases notesRoger Dingledine2011-10-26
| | |
* | | bump to 0.2.3.6-alphaRoger Dingledine2011-10-26
| | |
* | | fold in changes entriesRoger Dingledine2011-10-26
| | |
* | | Merge branch 'maint-0.2.2_secfix' into master_secfixSebastian Hahn2011-10-27
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/tortls.c src/or/connection_or.c src/or/dirserv.c src/or/or.h
| * | Add option to give guard flag to relays without the CVE-2011-2768 fixRobert Ransom2011-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Don't give the Guard flag to relays without the CVE-2011-2768 fixRobert Ransom2011-10-26
| | |
| * | Make tor_version_same_series non-staticRobert Ransom2011-10-26
| | |
| * | Merge branch 'maint-0.2.1_secfix' into maint-0.2.2_secfixSebastian Hahn2011-10-26
| |\| | | | | | | | | | | | | Conflicts: src/or/connection_or.c
| | * Reject create cells on outgoing OR connections from bridgesRobert Ransom2011-10-26
| | |
| | * Mark which OR connections are outgoingRobert Ransom2011-10-26
| | |
| | * Don't use any OR connection which sent us a CREATE_FAST cell for an EXTENDRobert Ransom2011-10-26
| | | | | | | | | | | | Fix suggested by Nick Mathewson.
| | * Don't send a certificate chain on outgoing TLS connections from non-relaysNick Mathewson2011-10-26
| | |
* | | Merge branch 'maint-0.2.2'Roger Dingledine2011-10-26
|\| |
| * | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-10-26
| |\|
| | * Remove the -F option from tor-resolve.Nick Mathewson2011-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * manually backport a5232e0c4cRoger Dingledine2011-10-26
| | |
* | | Merge branch 'maint-0.2.2'Roger Dingledine2011-10-26
|\| |
| * | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-10-26
| |\|
| | * stop asserting at bootRoger Dingledine2011-10-26
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Reinit keys at the start of options_act().Nick Mathewson2011-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Don't crash a bridge authority on SIGHUP if it's not in the consensusRobert Ransom2011-10-26
| | | | | | | | | | | | Fixes bug 2572.
| | * Fix assert for relay/bridge state changeSebastian Hahn2011-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Don't crash when accountingmax is set in non-server TorsNick Mathewson2011-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Properly refcount client_identity_keySebastian Hahn2011-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Add some asserts to get_{tlsclient|server}_identity_keyNick Mathewson2011-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Rename get_client_identity_key to get_tlsclient_identity_keyNick Mathewson2011-10-26
| | |
| | * Maintain separate server and client identity keys when appropriate.Robert Ransom2011-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug described in ticket #988. Conflicts: src/or/main.c src/or/router.c
| | * Make crypto_free_pk_env tolerate NULL arg in 0.2.1. Error-proofing against ↵Nick Mathewson2011-10-26
| | | | | | | | | | | | bug 988 backport
| | * Maintain separate server and client TLS contexts.Robert Ransom2011-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #988. Conflicts: src/or/main.c src/or/router.c
| | * Refactor tor_tls_context_new:Robert Ransom2011-10-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | * Add public_server_mode function.Robert Ransom2011-10-26
| | |
* | | closer to a changelog for the next alphaRoger Dingledine2011-10-26
| | |
* | | Merge branch 'cov_run224_squashed'Nick Mathewson2011-10-26
|\ \ \
| * | | Changelog for recent coverity issuesNick Mathewson2011-10-26
| | | |
| * | | Fix memory leak in retry_all_listeners: Coverity CID 485Nick Mathewson2011-10-26
| | | |
| * | | Fix memory leak in options_act_reversible: fix Coverity CID 486,487Nick Mathewson2011-10-26
|/ / /
* | | Do not tread vpadding cell as versions cell. Not in any released version.Nick Mathewson2011-10-26
| | |
* | | Fix a NULL pointer dereference in parse_server_transport_line().George Kadianakis2011-10-26
| | |