commit b08ba1cb6c7e4fb7693500a893c4d4757a531c58 Author: Roger Dingledine arma@torproject.org Date: Sun Feb 12 23:39:30 2012 -0500
integrate recent changes files --- ChangeLog | 17 +++++++++++++++++ changes/bug5065 | 5 ----- changes/bug5082 | 6 ------ changes/bug5084 | 4 ---- changes/bug5097 | 9 --------- 5 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 755ab0d..e8839d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ Changes in version 0.2.3.12-alpha - 2012-02-?? o Major bugfixes: + - Fix building when the path to sed, openssl or sha1sum contains + spaces, which is pretty common on Windows. Fixes bug 5065; bugfix + on 0.2.2.1-alpha. - Set the SO_REUSEADDR socket option before we call bind() on outgoing connections. This change should allow busy exit relays to stop running out of available sockets as quickly. Fixes bug 4950; @@ -8,6 +11,14 @@ Changes in version 0.2.3.12-alpha - 2012-02-?? would ask the bridge for microdescriptors, which are only supported in 0.2.3.x and later, and then fail to bootstrap when it didn't get the answers it wanted. Fixes bug 4013; bugfix on 0.2.3.2-alpha. + - Avoid a crash when managed proxies are configured and we receive + HUP signals or configuration values too rapidly. This happens most + commonly when Vidalia tries to attach to Tor or tries to configure + the Tor it's attached to. Fixes bug 5084; bugfix on 0.2.3.6-alpha. + - Properly set up obfsproxy's environment in managed mode. The Tor + Browser Bundle needs LD_LIBRARY_PATH to be passed to obfsproxy, + and when you run your Tor as a daemon, there's no HOME. Fixes bugs + 5076 and 5082; bugfix on 0.2.3.6-alpha.
o Minor features: - Use the dead_strip option when building Tor on OS X. This reduces @@ -23,6 +34,12 @@ Changes in version 0.2.3.12-alpha - 2012-02-?? to info: people kept mistaking it for a real problem, whereas it is seldom the problem even when we are failing to bootstrap. Fixes bug 5067; bugfix on 0.2.0.10-alpha. + - Don't put "TOR_PT_EXTENDED_SERVER_PORT=127.0.0.1:4200" in a + managed pluggable transport server proxy's environment. + Previously, we would put it there, even though Tor doesn't + implement an 'extended server port' yet, and even though Tor + almost certainly isn't listening to that address. Bugfix on + 0.2.3.6-alpha. - Actually log the heartbeat message every HeartbeatPeriod seconds, not every HeartbeatPeriod + 1 seconds. Fixes bug 4942; bugfix on 0.2.3.1-alpha. Bug reported by Scott Bennett. diff --git a/changes/bug5065 b/changes/bug5065 deleted file mode 100644 index d195313..0000000 --- a/changes/bug5065 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - Fix build if path to sed, openssl or sha1sum contains spaces. - This is pretty common on Windows. Fixes bug 5065; bugfix on - 0.2.2.1-alpha. - diff --git a/changes/bug5082 b/changes/bug5082 deleted file mode 100644 index 1278e81..0000000 --- a/changes/bug5082 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes: - - Properly set up obfsproxy's environment in managed mode. On TBB, we - need LD_LIBRARY_PATH to be copied, and when you run your Tor as a - daemon, there's no HOME. Fixes bug 5082 and 5076; bugfix on - 0.2.3.6-alpha. - diff --git a/changes/bug5084 b/changes/bug5084 deleted file mode 100644 index bf175c6..0000000 --- a/changes/bug5084 +++ /dev/null @@ -1,4 +0,0 @@ - o Major bugfixes: - - Avoid a crash when managed proxies are configured and we receive - HUP signals or configuration values too rapidly. Fixes bug 5084; - bugfix on 0.2.3.6-alpha. diff --git a/changes/bug5097 b/changes/bug5097 deleted file mode 100644 index 770e9b5..0000000 --- a/changes/bug5097 +++ /dev/null @@ -1,9 +0,0 @@ - o Minor bugfixes: - - - Don't put "TOR_PT_EXTENDED_SERVER_PORT=127.0.0.1:4200" in a - managed pluggable transport server proxy's environment. - Previously, we would put it there, even though Tor doesn't - implement an 'extended server port' yet, and even though Tor - almost certainly isn't listening to that address. Bugfix on - 0.2.3.6-alpha. -