aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2011-11-16Merge branch 'bug4457_022' into maint-0.2.2Nick Mathewson
2011-11-14Use real_addr in send_netinfoNick Mathewson
Reported by "troll_un"; bugfix on 0.2.0.10-alpha; fixes bug 4349.
2011-11-14Detect failure from event_init() or event_base_new_with_config()Nick Mathewson
2011-11-14Use the EVENT_BASE_FLAG_NOLOCK flag to prevent socketpair() invocationNick Mathewson
In Tor 0.2.2, we never need the event base to be notifiable, since we don't call it from other threads. This is a workaround for bug 4457, which is not actually a Tor bug IMO.
2011-11-14Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-11-14Merge remote-tracking branch 'karsten/geoip-november2011' into maint-0.2.1Nick Mathewson
2011-11-09Merge remote-tracking branch 'rransom-tor/bug4426' into maint-0.2.2Nick Mathewson
2011-11-09Don't warn when compiling with --disable-threadsSebastian Hahn
STMT_VOID semantics suggested by nick, thanks!
2011-11-07Include HiddenServiceDir in some warning messagesRobert Ransom
2011-11-07Merge branch 'bug4424' into maint-0.2.2Nick Mathewson
2011-11-07Remove an extraneous "if" in the 4424 fixNick Mathewson
2011-11-07Don't leak an extend_info_t in rend_client_any_intro_points_usableRobert Ransom
2011-11-07Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-11-07Update to the November 2011 GeoIP database.Karsten Loesing
2011-11-06Fix remotely triggerable assert during ip decryptionDan Rosenberg
Fixes bug 4410.
2011-11-03Fix a memleak when fetching descriptors for bridges in ExcludeNodes.George Kadianakis
2011-10-29Disable stats requiring geoip info if we have noneSebastian Hahn
In other parts of the code we will otherwise attempt to collect these statistics, and that will lead to crashes.
2011-10-28Discard all cells on a marked connectionNick Mathewson
Fix for bug 4299
2011-10-28Fix typo, spotted by tmpname0901. Thanks!Sebastian Hahn
2011-10-27bump maint-0.2.2 to 0.2.2.34-devRoger Dingledine
2011-10-27bump maint to 0.2.1.31Roger Dingledine
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-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-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 remote-tracking branch 'public/cov_run224_022' into maint-0.2.2Nick Mathewson
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-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-20Merge remote-tracking branch 'rransom-tor/bug4251-022' into maint-0.2.2Nick Mathewson
2011-10-19Fix crash when changing node restrictions with DNS lookup in progressNick Mathewson
Fixes bug 4259, bugfix on 0.2.2.25-alpha. Bugfix by "Tey'". Original message by submitter: Changing nodes restrictions using a controller while Tor is doing DNS resolution could makes Tor crashes (on WinXP at least). The problem can be repeated by trying to reach a non-existent domain using Tor: curl --socks4a 127.0.0.1:9050 inexistantdomain.ext .. and changing the ExitNodes parameter through the control port before Tor returns a DNS resolution error (of course, the following command won't work directly if the control port is password protected): echo SETCONF ExitNodes=TinyTurtle | nc -v 127.0.0.1 9051 Using a non-existent domain is needed to repeat the issue so that Tor takes a few seconds for resolving the domain (which allows us to change the configuration). Tor will crash while processing the configuration change. The bug is located in the addressmap_clear_excluded_trackexithosts method which iterates over the entries of the addresses map in order to check whether the changes made to the configuration will impact those entries. When a DNS resolving is in progress, the new_adress field of the associated entry will be set to NULL. The method doesn't expect this field to be NULL, hence the crash.
2011-10-18Free rend_data and intro_key when extra intro circs become general-purposeRobert Ransom
2011-10-13Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion