aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-09-29 12:49:59 +0200
committerNick Mathewson <nickm@torproject.org>2015-09-29 12:49:59 +0200
commitaaf748435cb6e42922bf5948b04b4679bbf649b1 (patch)
tree051f516b353719dd599e08d8feabeba75ea51996
parentefff55bdfd45e1587d074430ffe5a8a775a35bf5 (diff)
parent22a912755faba6ef1315f701b358b005906a3100 (diff)
downloadtor-aaf748435cb6e42922bf5948b04b4679bbf649b1.tar.gz
tor-aaf748435cb6e42922bf5948b04b4679bbf649b1.zip
Merge remote-tracking branch 'origin/maint-0.2.7'
-rw-r--r--ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0191717334..46005a9093 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,7 +61,7 @@ Changes in version 0.2.7.3-rc - 2015-09-25
Fixes bug 16685; bugfix on 0.2.7.2-alpha. Reported by "s7r".
o Minor features (client-side privacy):
- - New KeyepAliveIsolateSOCKSAuth option to indefinitely extend circuit
+ - New KeepAliveIsolateSOCKSAuth option to indefinitely extend circuit
lifespan when IsolateSOCKSAuth and streams with SOCKS
authentication are attached to the circuit. This allows
applications like TorBrowser to manage circuit lifetime on their