summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-08-08 10:09:17 -0400
committerNick Mathewson <nickm@torproject.org>2014-08-08 10:09:17 -0400
commitbb68c731b897a967a4b7eb138728fa077617646e (patch)
tree20d7c23762568756b01a6f698d09b7bee6dad808 /changes
parent374611d9f6d1efd7ae6c3570104b284991519293 (diff)
parentfcac4b4467427e8f6ad948e8c8e6f34a0131e716 (diff)
downloadtor-bb68c731b897a967a4b7eb138728fa077617646e.tar.gz
tor-bb68c731b897a967a4b7eb138728fa077617646e.zip
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug11200-caching7
1 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug11200-caching b/changes/bug11200-caching
new file mode 100644
index 0000000000..e3fbaeca73
--- /dev/null
+++ b/changes/bug11200-caching
@@ -0,0 +1,7 @@
+ o Major bugfixes:
+ - When Tor starts with DisabledNetwork set, it would correctly
+ conclude that it shouldn't try making circuits, but it would
+ mistakenly cache this conclusion and continue believing it even
+ when DisableNetwork is set to 0. Fixes the bug introduced by the
+ fix for bug 11200; bugfix on 0.2.5.4-alpha.
+