Преглед на файлове

and fold it into master too

Roger Dingledine преди 12 години
родител
ревизия
325f33047a
променени са 2 файла, в които са добавени 2 реда и са изтрити 4 реда
  1. 2 0
      ChangeLog
  2. 0 4
      changes/bug6774

+ 2 - 0
ChangeLog

@@ -178,6 +178,8 @@ Changes in version 0.2.3.21-rc - 2012-09-05
       when provided via the controller's MapAddress command. Previously,
       they were accepted, but we never actually noticed that they were
       wildcards. Fixes bug 6244; bugfix on 0.2.3.9-alpha.
+    - Avoid crashing on a malformed state file where EntryGuardPathBias
+      precedes EntryGuard. Fix for bug 6774; bugfix on 0.2.3.17-beta.
     - Add a (probably redundant) memory clear between iterations of
       the router status voting loop, to prevent future coding errors
       where data might leak between iterations of the loop. Resolves

+ 0 - 4
changes/bug6774

@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Avoid crashing on a malformed state file where EntryGuardPathBias
-      precedes EntryGuard. Fix for bug 6774; bugfix on 0.2.3.17-beta.
-