Start work on an 0.3.2.5-alpha changelog.

23 files changed, 116 insertions, 100 deletions

diff --git a/ChangeLog b/ChangeLog
index eddd0952eb..0f9e6918ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,119 @@
+Changes in version 0.3.2.5-alpha - 2017-11-22
+  Tor 0.3.2.4-alpha is the fifth alpha release in the 0.3.2.x series. It
+  fixes several stability and reliability bugs, including a fix for
+  intermittent bootstrapping failures that some people have been seeing
+  since the 0.3.0.x series.
+
+  Please test this alpha out -- many of these fixes will soon be
+  backported to stable Tor versions if no additional bugs are found
+  in them.
+
+  o Minor features (directory authority):
+    - Make the "Exit" flag assignment only depend on whether the exit
+      policy allows connections to ports 80 and 443. Previously relays
+      would get the Exit flag if they allowed connections to one of
+      these ports and also port 6667. Resolves ticket 23637.
+
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the November 6 2017 Maxmind GeoLite2
+      Country database.
+
+  o Minor features (linux seccomp2 sandbox):
+    - Update the sandbox rules so that they should now work correctly
+      with Glibc 2.26. Closes ticket 24315.
+
+  o Minor features (logging):
+    - Downgrade a pair of log messages that could occur when an exit's
+      resolver gave us an unusual (but not forbidden) response. Closes
+      ticket 24097.
+    - Improve the message we log when re-enabling circuit build timeouts
+      after having received a consensus. Closes ticket 20963.
+
+  o Minor bugfixes (bootstrapping):
+    - Fetch descriptors aggressively whenever we lack enough to build
+      circuits, regardless of how many descriptors we are missing.
+      Previously, we would delay launching the fetch when we had fewer
+      than 15 missing descriptors, even if some of those descriptors
+      were blocking circuits from building. Fixes bug 23985; bugfix on
+      0.1.1.11-alpha. The effects of this bug became worse in
+      0.3.0.3-alpha, when we began treating missing descriptors from our
+      primary guards as a reason to delay circuits.
+    - Don't try fetching microdescriptors from relays that have failed
+      to deliver them in the past. Fixes bug 23817; bugfix
+      on 0.3.0.1-alpha.
+
+  o Minor bugfixes (compilation):
+    - Fix a memory leak warning in one of the libevent-related
+      configuration tests that could occur when manually specifying
+      -fsanitize=address. Fixes bug 24279; bugfix on 0.3.0.2-alpha.
+      Found and patched by Alex Xu.
+    - When detecting OpenSSL on Windows from our configure script, make
+      sure to try linking with the ws2_32 library. Fixes bug 23783;
+      bugfix on 0.3.2.2-alpha.
+
+  o Minor bugfixes (control port, linux seccomp2 sandbox):
+    - Avoid a crash when attempting to use the seccomp2 sandbox together
+      with the OwningControllerProcess feature. Fixes bug 24198; bugfix
+      on 0.2.5.1-alpha.
+
+  o Minor bugfixes (control port, onion services):
+    - Report "FAILED" instead of "UPLOAD_FAILED" "FAILED" for the
+      HS_DESC event when a service is not able to upload a descriptor.
+      Fixes bug 24230; bugfix on 0.2.7.1-alpha.
+
+  o Minor bugfixes (directory cache):
+    - Recover better from empty or corrupt files in the consensus cache
+      directory. Fixes bug 24099; bugfix on 0.3.1.1-alpha.
+    - When a consensus diff calculation is only partially successful,
+      only record the successful parts as having succeeded. Partial
+      success can happen if (for example) one compression method fails
+      but the others succeed. Previously we misrecorded all the
+      calculations as having succeeded, which would later cause a
+      nonfatal assertion failure. Fixes bug 24086; bugfix
+      on 0.3.1.1-alpha.
+
+  o Minor bugfixes (logging):
+    - Only log once if we notice that KIST support is gone. Fixes bug
+      24158; bugfix on 0.3.2
+    - Suppress a log notice when relay descriptors arrive. We already
+      have a bootstrap progress for this so no need to log notice
+      everytime tor receives relay descriptors. Microdescriptors behave
+      the same. Fixes bug 23861; bugfix on 0.2.8.2-alpha.
+
+  o Minor bugfixes (network layer):
+    - When closing a connection via close_connection_immediately(), we
+      mark it as "not blocked on bandwidth", to prevent later calls from
+      trying to unblock it, and give it permission to read. This fixes a
+      backtrace warning that can happen on relays under various
+      circumstances. Fixes bug 24167; bugfix on 0.1.0.1-rc.
+
+  o Minor bugfixes (onion services):
+    - The introduction circuit was being timed out too quickly while
+      waiting for the rendezvous circuit to complete. Keep the intro
+      circuit around longer instead of timing out and reopening new ones
+      constantly. Fixes bug 23681; bugfix on 0.2.4.8-alpha.
+    - Fix the consensus parameter "hsdir-interval" to "hsdir_interval"
+      so it matches the dir-spec.txt. Fixes bug 24262; bugfix
+      on 0.3.1.1-alpha.
+    - Silence a warning about failed v3 onion descriptor uploads that
+      can happen naturally under certain edge-cases. Fixes part of bug
+      23662; bugfix on 0.3.2.1-alpha.
+
+  o Minor bugfixes (tests):
+    - Fix a memory leak in one of the bridge-distribution test cases.
+      Fixes bug 24345; bugfix on 0.3.2.3-alpha.
+    - Fix a bug in our fuzzing mock replacement for crypto_pk_checksig(),
+      to correctly handle cases where a caller gives it an RSA key of
+      under 160 bits. (This is not actually a bug in Tor itself, but
+      wrather in our fuzzing code.) Fixes bug 24247; bugfix on
+      0.3.0.3-alpha. Found by OSS-Fuzz as issue 4177.
+
+  o Documentation:
+    - Add notes in man page regarding OS support for the various
+      scheduler types. Attempt to use less jargon in the scheduler
+      section. Closes ticket 24254.
+
+
 Changes in version 0.3.2.4-alpha - 2017-11-08
   Tor 0.3.2.4-alpha is the fourth alpha release in the 0.3.2.x series.
   It fixes several stability and reliability bugs, especially including
diff --git a/changes/bug20963 b/changes/bug20963
deleted file mode 100644
index a65c58399c..0000000000
--- a/changes/bug20963
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (logging):
-    - Improve the message we log when re-enabling circuit build timeouts
-      after having received a consensus. Closes ticket 20963.
-
diff --git a/changes/bug23662 b/changes/bug23662
deleted file mode 100644
index 1000bde3d6..0000000000
--- a/changes/bug23662
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (onion services):
-    - Silence a warning about failed v3 onion descriptor uploads since it can
-      happen naturally under certain edge-cases. Fixes part of bug 23662;
-      bugfix on 0.3.2.1-alpha.
diff --git a/changes/bug23681 b/changes/bug23681
deleted file mode 100644
index e317f36d50..0000000000
--- a/changes/bug23681
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (hidden service client):
-    - The introduction circuit was being timed out too quickly while waiting
-      for the rendezvous circuit to complete. Keep the intro circuit around
-      longer instead of timing out and reopening new ones constantly. Fixes
-      bug 23681; bugfix on 0.2.4.8-alpha.
diff --git a/changes/bug23783 b/changes/bug23783
deleted file mode 100644
index 98c583a12b..0000000000
--- a/changes/bug23783
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (compilation, windows):
-    - When detecting OpenSSL on Windows from our configure script, make sure
-      to try linking with the ws2_32 library. Fixes bug 23783; bugfix on
-      0.3.2.2-alpha.
-
diff --git a/changes/bug23817 b/changes/bug23817
deleted file mode 100644
index 4740942799..0000000000
--- a/changes/bug23817
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (descriptors):
-    - Don't try fetching microdescriptors from relays that have failed to
-      deliver them in the past. Fixes bug 23817; bugfix on 0.3.0.1-alpha.
diff --git a/changes/bug23861 b/changes/bug23861
deleted file mode 100644
index c6f017640d..0000000000
--- a/changes/bug23861
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (logging, relay):
-    - Suppress a log notice when relay descriptors arrive. We already have a
-      bootstrap progress for this so no need to log notice everytime tor
-      receives relay descriptors. Microdescriptors behave the same. Fixes bug
-      23861; bugfix on 0.2.8.2-alpha.
diff --git a/changes/bug23985 b/changes/bug23985
deleted file mode 100644
index 9cb5937962..0000000000
--- a/changes/bug23985
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Minor bugfixes (bootstrapping):
-    - Fetch descriptors aggressively whenever we lack enough
-      to build circuits, regardless of how many descriptors we are missing.
-      Previously, we would delay launching the fetch when we had fewer than
-      15 missing descriptors, even if some of those descriptors were
-      blocking circuits from building. Fixes bug 23985; bugfix on
-      0.1.1.11-alpha. The effects of this bug became worse in 0.3.0.3-alpha,
-      when we began treating missing descriptors from our primary guards
-      as a reason to delay circuits.
diff --git a/changes/bug24086 b/changes/bug24086
deleted file mode 100644
index 2ae0b37e65..0000000000
--- a/changes/bug24086
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (directory cache):
-    - When a consensus diff calculation is only partially successful, only
-      record the successful parts as having succeeded. Partial success
-      can happen if (for example) one compression method fails but
-      the others succeed. Previously we misrecorded all the calculations as
-      having succeeded, which would later cause a nonfatal assertion failure.
-      Fixes bug 24086; bugfix on 0.3.1.1-alpha.
diff --git a/changes/bug24099 b/changes/bug24099
deleted file mode 100644
index dca3992664..0000000000
--- a/changes/bug24099
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (directory cache):
-    - Recover better from empty or corrupt files in the consensus cache
-      directory. Fixes bug 24099; bugfix on 0.3.1.1-alpha.
-
diff --git a/changes/bug24167 b/changes/bug24167
deleted file mode 100644
index fd0d87efff..0000000000
--- a/changes/bug24167
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (network layer):
-    - When closing a connection via close_connection_immediately(), we
-      mark it as "not blocked on bandwidth", to prevent later calls
-      from trying to unblock it, and give it permission to read. This
-      fixes a backtrace warning that can happen on relays under various
-      circumstances. Fixes bug 24167; bugfix on 0.1.0.1-rc.
-
diff --git a/changes/bug24198 b/changes/bug24198
deleted file mode 100644
index 6790706872..0000000000
--- a/changes/bug24198
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (controller, linux seccomp2 sandbox):
-    - Avoid a crash when attempting to use the seccomp2 sandbox
-      together with the OwningControllerProcess feature.
-      Fixes bug 24198; bugfix on 0.2.5.1-alpha.
diff --git a/changes/bug24230 b/changes/bug24230
deleted file mode 100644
index b08c4cde24..0000000000
--- a/changes/bug24230
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (control port, hidden service):
-    - Control port was reporting the action "UPLOAD_FAILED" instead of
-      "FAILED" for the HS_DESC event when a service was not able to upload a
-      descriptor. Fixes bug 24230; bugfix on 0.2.7.1-alpha.
diff --git a/changes/bug24247 b/changes/bug24247
deleted file mode 100644
index 1f4ddcdde2..0000000000
--- a/changes/bug24247
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes (fuzzing):
-    - Fix a bug in our fuzzing mock replacement for crypto_pk_checksig(), to
-      correctly handle cases where a caller gives it an RSA key of under 160
-      bits. (This is not actually a bug in Tor itself, but wrather in our
-      fuzzing code.)  Fixes bug 24247; bugfix on 0.3.0.3-alpha.
-      Found by OSS-Fuzz as issue 4177.
diff --git a/changes/bug24262 b/changes/bug24262
deleted file mode 100644
index eee69512e4..0000000000
--- a/changes/bug24262
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (hidden service):
-    - Fix the consensus parameter "hsdir-interval" to "hsdir_interval" so it
-      matches the dir-spec.txt. Fixes bug 24262; bugfix on 0.3.1.1-alpha.
diff --git a/changes/bug24279 b/changes/bug24279
deleted file mode 100644
index ab2932b341..0000000000
--- a/changes/bug24279
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (compilation, hardening):
-    - Fix a memory leak warning in one of the libevent-related
-      configuration tests that could occur when manually specifying
-      -fsanitize=address.  Fixes bug 24279; bugfix on 0.3.0.2-alpha.
-      Found and patched by Alex Xu.
diff --git a/changes/bug24345 b/changes/bug24345
deleted file mode 100644
index 22eb412514..0000000000
--- a/changes/bug24345
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (tests):
-    - Fix a unit test in one of the bridge-distribution test cases.
-      Fixes bug 24345; bugfix on 0.3.2.3-alpha.
diff --git a/changes/geoip-2017-11-06 b/changes/geoip-2017-11-06
deleted file mode 100644
index f034be9006..0000000000
--- a/changes/geoip-2017-11-06
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (geoip):
-    - Update geoip and geoip6 to the November 6 2017 Maxmind GeoLite2
-      Country database.
-
diff --git a/changes/ticket23637 b/changes/ticket23637
deleted file mode 100644
index 0c524f34c3..0000000000
--- a/changes/ticket23637
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features (directory authority):
-    - Make the "Exit" flag assignment only depend on whether the exit
-      policy allows connections to ports 80 and 443. Previously relays
-      would get the Exit flag if they allowed connections to one of
-      these ports and also port 6667. Resolves ticket 23637.
diff --git a/changes/ticket24097 b/changes/ticket24097
deleted file mode 100644
index 36547a8ddb..0000000000
--- a/changes/ticket24097
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (logging):
-    - Downgrade a pair of log messages that could occur when an exit's
-      resolver gave us an unusual (but not forbidden) response.
-      Closes ticket 24097.
diff --git a/changes/ticket24158 b/changes/ticket24158
deleted file mode 100644
index 3cdc06afae..0000000000
--- a/changes/ticket24158
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (logging):
-    Only log about no longer having KIST support once. Fixes bug 24158; bugfix
-    on 0.3.2
diff --git a/changes/ticket24254 b/changes/ticket24254
deleted file mode 100644
index 98d5d6bacd..0000000000
--- a/changes/ticket24254
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation:
-    Add notes in man page regarding OS support for the various scheduler types.
-    Attempt to use less jargon in the scheduler section. Closes ticket 24254.
diff --git a/changes/ticket24315 b/changes/ticket24315
deleted file mode 100644
index df34dbf412..0000000000
--- a/changes/ticket24315
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Major features (linux seccomp2 sandbox):
-    - Update the sandbox rules so that they should now work correctly with
-      Glibc 2.26.  Closes  ticket 24315.