[tor-commits] [tor/master] fold in changes files so far

arma at torproject.org arma at torproject.org
Sat Sep 15 20:40:19 UTC 2012


commit 2e342df7cdde5236ce2bdf2db457d193bdbffa5e
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Sep 15 16:38:47 2012 -0400

    fold in changes files so far
---
 ChangeLog                 |   57 +++++++++++++++++++++++++++++++++++++++++++++
 changes/bug6341           |    5 ----
 changes/bug6538           |   16 ------------
 changes/bug6811           |    5 ----
 changes/bug6815           |    6 ----
 changes/bug6819           |    3 --
 changes/bug6827           |    9 -------
 changes/bug6831           |    4 ---
 changes/bug6833           |    4 ---
 changes/bug6844           |    4 ---
 changes/old_gcc_macro_fix |    5 ----
 changes/refactor_config   |    3 --
 12 files changed, 57 insertions(+), 64 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 495ddf2..c517207 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,60 @@
+Changes in version 0.2.4.3-alpha - 2012-09-??
+  o Security fixes:
+    - Fix an assertion failure in tor_timegm() that could be triggered
+      by a badly formatted directory object. Bug found by fuzzing with
+      Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc.
+
+  o Major bugfixes:
+    - Fix a possible crash bug when checking for deactivated circuits
+      in connection_or_flush_from_first_active_circuit(). Fixes bug 6341;
+      bugfix on 0.2.2.7-alpha. Bug report and fix received pseudonymously.
+    - Allow routers to detect that their own DirPorts are running. When
+      we removed support for versions_supports_begindir, we also
+      accidentally removed the mechanism we used to self-test our
+      DirPort. Diagnosed with help from kargig. Fixes bugs 6814 and 6815;
+      bugfix on 0.2.4.2-alpha.
+
+  o Security features:
+    - Switch to a completely time-invariant approach for picking nodes
+      weighted by bandwidth. Our old approach would run through the
+      part of the loop after it had made its choice slightly slower
+      than it ran through the part of the loop before it had made its
+      choice. Addresses ticket 6538.
+
+  o Minor bugfixes:
+    - Correct file sizes when reading binary files on Cygwin, to avoid
+      a bug where Tor would fail to read its state file. Fixes bug 6844;
+      bugfix on 0.1.2.7-alpha.
+    - Fix round_to_power_of_2() so it doesn't invoke undefined behavior
+      with large values. This situation was untriggered, but nevertheless
+      incorrect. Fixes bug 6831; bugfix on 0.2.0.1-alpha.
+    - Reject consensus votes with more than 64 known-flags. We aren't even
+      close to that limit yet, and our code doesn't handle it correctly.
+      Fixes bug 6833; bugfix on 0.2.0.1-alpha.
+    - Avoid undefined behaviour when parsing the list of supported
+      rendezvous/introduction protocols in a hidden service descriptor.
+      Previously, Tor would have confused (as-yet-unused) protocol version
+      numbers greater than 32 with lower ones on many platforms. Fixes
+      bug 6827; bugfix on 0.2.0.10-alpha. Found by George Kadianakis.
+    - Fix building with older versions of GCC that don't like preprocessor
+      directives inside macro arguments. Found by grarpamp. Fixes bug
+      6842; bugfix on 0.2.4.2-alpha.
+    - Switch weighted node selection rule from using a list of doubles
+      to using a list of int64_t. This change should make the process
+      slightly easier to debug and maintain. Needed to finish ticket 6538.
+
+  o Code simplification and refactoring:
+    - Move the generic "config" code into a new file, and have "config.c"
+      hold only torrc- and state-related code. Resolves ticket 6823.
+    - Move the core of our "choose a weighted element at random" logic
+      into its own function, and give it unit tests. Now the logic is
+      testable, and a little less fragile too.
+
+  o Documentation fixes:
+    - Resolve a typo in torrc.sample.in. Fixes bug 6819; bugfix on
+      0.2.3.14-alpha.
+
+
 Changes in version 0.2.3.22-rc - 2012-09-11
   Tor 0.2.3.22-rc fixes another opportunity for a remotely triggerable
   assertion.
diff --git a/changes/bug6341 b/changes/bug6341
deleted file mode 100644
index 04e52c7..0000000
--- a/changes/bug6341
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-    - Fix a possible crash bug when checking for deactivated circuits
-      in connection_or_flush_from_first_active_circuit(). Fixes bug 
-      6341; bugfix on 0.2.2.7-alpha. Bug report and fix received
-      pseudonymously.
diff --git a/changes/bug6538 b/changes/bug6538
deleted file mode 100644
index 03c168b..0000000
--- a/changes/bug6538
+++ /dev/null
@@ -1,16 +0,0 @@
-  o Minor bugfixes:
-    - Switch weighted node selection rule from using a list of doubles
-      to using a list of int64_t. This should make the process slightly
-      easier to debug and maintain. Needed for fix for bug 6538.
-
-  o Security features:
-    - Switch to a completely time-invariant approach for picking nodes
-      weighted by bandwidth. Our old approach would run through the
-      part of the loop after it had made its choice slightly slower
-      than it ran through the part of the loop before it had made its
-      choice. Fix for bug 6538.
-
-  o Code simplifications and refactoring:
-    - Move the core of our "choose a weighted element at random" logic
-      into its own function, and give it unit tests.  Now the logic is
-      testable, and a little less fragile too.
diff --git a/changes/bug6811 b/changes/bug6811
deleted file mode 100644
index 841ec1c..0000000
--- a/changes/bug6811
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major security fixes:
-    - Fix an assertion failure in tor_timegm that could be triggered
-      by a badly formatted directory object.  Bug found by fuzzing with
-      Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc.
-      
diff --git a/changes/bug6815 b/changes/bug6815
deleted file mode 100644
index d6a1233..0000000
--- a/changes/bug6815
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes:
-    - Allow routers to correctly detect their own DirPorts as running.
-      When we removed support for versions_supports_begindir, we also
-      accidentally removed the mechanism we used to self-test our
-      DirPort. Diagnosed with help from kargig. Fixes bugs 6814 and
-      6815; bugfix on 0.2.4.2-alpha.
diff --git a/changes/bug6819 b/changes/bug6819
deleted file mode 100644
index 8b5c224..0000000
--- a/changes/bug6819
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation fixes:
-    - Resolve a typo in torrc.sample.in. Fixes bug 6819; bugfix on
-      0.2.3.14-alpha.
diff --git a/changes/bug6827 b/changes/bug6827
deleted file mode 100644
index bf71d2b..0000000
--- a/changes/bug6827
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Minor bugfixes:
-
-    - Avoid undefined behaviour when parsing the list of supported
-      rendezvous/introduction protocols in a hidden service
-      descriptor.  Previously, Tor would have confused (as-yet-unused)
-      protocol version numbers greater than 32 with lower ones on many
-      platforms.  Fixes bug 6827; bugfix on 0.2.0.10-alpha; found by
-      George Kadianakis.
-
diff --git a/changes/bug6831 b/changes/bug6831
deleted file mode 100644
index ac4775b..0000000
--- a/changes/bug6831
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Fix round_to_power_of_2 so it doesn't invoke undefined behavior
-      with large values. This was untriggered, but nevertheless incorrect.
-      Fixes bug 6831; bugfix on 0.2.0.1-alpha.
diff --git a/changes/bug6833 b/changes/bug6833
deleted file mode 100644
index 4a6a5d3..0000000
--- a/changes/bug6833
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (directory authority):
-    - Reject consensus votes with more than 64 known-flags. We aren't even
-      close to that limit yet, and our code doesn't handle it
-      correctly. Fixes bug 6833; bugfix on 0.2.0.1-alpha.
diff --git a/changes/bug6844 b/changes/bug6844
deleted file mode 100644
index 338e19d..0000000
--- a/changes/bug6844
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-   - Correct file sizes when reading binary files on
-     Cygwin, to avoid a bug where Tor would fail to read its state file.
-     Fixes bug 6844; bugfix on 0.1.2.7-alpha.
diff --git a/changes/old_gcc_macro_fix b/changes/old_gcc_macro_fix
deleted file mode 100644
index 5fc0a47..0000000
--- a/changes/old_gcc_macro_fix
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - Fix building with older versions of GCC that don't like preprocessor
-      directives inside macro arguments. Found by grarpamp. Fixes bug 6842;
-      bugfix on 0.2.4.2-alpha.
-     
diff --git a/changes/refactor_config b/changes/refactor_config
deleted file mode 100644
index 8d272e7..0000000
--- a/changes/refactor_config
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Code simplification and refactoring:
-    - Move the generic "config" code into a new file, and have "config.c"
-      hold only torrc- and state-related code.



More information about the tor-commits mailing list