Merge remote-tracking branch 'origin/maint-0.2.5'

2024-12-06 19:41:15 +01:00 · 2014-08-08 10:09:17 -04:00
parent 374611d9f6 fcac4b4467
commit bb68c731b8
4 changed files with 22 additions and 12 deletions
@@ -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.
+