summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2012-02-13 00:16:05 -0500
committerRoger Dingledine <arma@torproject.org>2012-02-13 00:16:05 -0500
commit5b4d72168f39d1fc732760dd2fd851e9df3f7981 (patch)
tree9e7cc87d9dcf7d8ac6ed3ae382d200acab91f3e9
parent765f71cf2a6814ecea527148b52a6396f50be4c1 (diff)
downloadtor-5b4d72168f39d1fc732760dd2fd851e9df3f7981.tar.gz
tor-5b4d72168f39d1fc732760dd2fd851e9df3f7981.zip
revise changelog entry for 5097 too
-rw-r--r--ChangeLog5
1 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e8839d5af2..e095ae4e9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,8 +38,9 @@ Changes in version 0.2.3.12-alpha - 2012-02-??
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.
+ almost certainly isn't listening to that address. For now, we set
+ it to an empty string, to avoid crashing older obfsproxies. 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.