Fold more changes files into the changelog

diff --git a/ChangeLog b/ChangeLog
index bc7f1055b9c9407b442e9cc338b955b56f16d040..5a9dbbf63d2cb7e82d344fce9a538b448cbb30b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,9 +38,21 @@ Changes in version 0.2.8.2-rc - 2016-03-??
       Fixes bug 18348; bugfix on 0.2.8.1-alpha. Reported by sysrqb,
       patch by teor.
 
-  o Minor features:
-    - Update geoip and geoip6 to the February 2 2016 Maxmind GeoLite2
-      Country database.
+  o Major bugfixes (voting):
+    - Actually enable Ed25519-based directory collation. Previously, the
+      code had been written, but some debugging code that had
+      accidentally been left in the codebase made it stay turned off.
+      Fixes bug 17702; bugfix on 0.2.7.2-alpha.
+    - When collating votes by Ed25519 identities, authorities now
+      include a "NoEdConsensus" flag if the ed25519 value (or lack
+      thereof) for a server does not reflect the majority consensus.
+      Related to bug 17668; bugfix on 0.2.7.2-alpha.
+    - When generating a vote with keypinning disabled, never include two
+      entries for the same ed25519 identity. This bug was causing
+      authorities to generate votes that they could not parse when a
+      router violated key pinning by changing its RSA identity but
+      keeping its Ed25519 identity. Fixes bug 17668; fixes part of bug
+      18318. Bugfix on 0.2.7.2-alpha.
 
   o Minor feature (IPv6):
     - Add ClientPreferIPv6DirPort, which is set to 0 by default. If set
@@ -84,6 +96,12 @@ Changes in version 0.2.8.2-rc - 2016-03-??
     - Update geoip and geoip6 to the March 3 2016 Maxmind GeoLite2
       Country database.
 
+  o Minor features (linux seccomp2 sandbox):
+    - Detect and reject attempts to change our Address with "Sandbox 1"
+      enabled. Changing Address with Sandbox turned on would never
+      actually work, but previously it would fail in strange and
+      confusing ways. Found while fixing 18548.
+
   o Minor features (robustness):
     - Exit immediately with an error message if the code attempts to use
       libevent without having initialized it. This should resolve some
@@ -177,7 +195,20 @@ Changes in version 0.2.8.2-rc - 2016-03-??
       both on success or failure. It was previously hardcoded with
       UNKNOWN. Fixes bug 16023; bugfix on 0.2.7.2-alpha.
 
+  o Minor bugfixes (linux seccomp2 sandbox):
+    - Avoid a 10-second delay when starting as a client with "Sandbox 1"
+      enabled and no DNS resolvers configured. This should help TAILS
+      start up faster. Fixes bug 18548; bugfix on 0.2.5.1-alpha.
+    - Fix the sandbox's interoprability with unix sockets under setuid.
+      Fixes bug 18253; bugfix on 0.2.8.1-alpha.
+    - Allow the setrlimit syscall, and the prlimit and prlimit64
+      syscalls, which some libc implementations use under the hood.
+      Fixes bug 15221; bugfix on 0.2.5.1-alpha.
+
   o Minor bugfixes (logging):
+    - When logging information about an unparseable networkstatus vote
+      or consensus, do not say "vote" when we mean consensus. Fixes bug
+      18368; bugfix on 0.2.0.8-alpha.
     - Scrub service in from "unrecognized service ID" log messages.
       Fixes bug 18600; bugfix on 0.2.4.11-alpha.
 
@@ -195,11 +226,6 @@ Changes in version 0.2.8.2-rc - 2016-03-??
       part of bug 17852; bugfix on 0.2pre13. Part of ticket 17852. Patch
       from 'jsturgix'. Found with Flawfinder.
 
-  o Minor bugfixes (sandbox):
-    - Allow the setrlimit syscall, and the prlimit and prlimit64
-      syscalls, which some libc implementations use under the hood.
-      Fixes bug 15221; bugfix on 0.2.5.1-alpha.
-
   o Minor bugfixes (test networks, IPv6):
     - Allow internal IPv6 addresses in descriptors in test networks.
       Fixes bug 17153; bugfix on 6b4af1071 in 0.2.3.16-alpha. Patch by
@@ -212,6 +238,11 @@ Changes in version 0.2.8.2-rc - 2016-03-??
       unit tests (for example, if you want to perform branch coverage).
       Fixes bug 18242; bugfix on 0.2.7.1-alpha.
 
+  o Minor bugfixes (tor-gencert):
+    - Correctly handle the case where an authority operator enters a
+      passphrase but sends an EOF before sending a newline. Fixes bug
+      17443; bugfix on 0.2.0.20-rc. Found by "junglefowl".
+
   o Code simplification and refactoring:
     - Quote all the string interpolations in configure.ac -- even those
       which we are pretty sure can't contain spaces. Closes ticket

diff --git a/changes/bug17443 b/changes/bug17443
deleted file mode 100644 (file)
index e4c040b..0000000
--- a/changes/bug17443
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (tor-gencert):
-    - Correctly handle the case where an authority operator enters a
-      passphrase but sends an EOF before sending a newline.
-      Fixes bug 17443; bugfix on 0.2.0.20-rc. Found by "junglefowl".
-

diff --git a/changes/bug17668 b/changes/bug17668
deleted file mode 100644 (file)
index fa5c1c8..0000000
--- a/changes/bug17668
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes (voting):
-    - When collating votes by Ed25519 identities, authorities now
-      include a "NoEdConsensus" flag if the ed25519 value (or lack thereof)
-      for a server does not reflect the majority consensus. Related to bug
-      17668; bugfix on 0.2.7.2-alpha.

diff --git a/changes/bug17702 b/changes/bug17702
deleted file mode 100644 (file)
index eddfe1e..0000000
--- a/changes/bug17702
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes (voting):
-    - Actually enable Ed25519-based directory collation.
-      Previously, the code had been written, but some debugging code that had
-      accidentally been left in the codebase made it stay turned off.
-      Fixes bug 17702; bugfix on 0.2.7.2-alpha.
-

diff --git a/changes/bug18253 b/changes/bug18253
deleted file mode 100644 (file)
index 56bc701..0000000
--- a/changes/bug18253
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (linux seccomp2 sandbox):
-    - Fix the sandbox's interoprability with unix sockets under setuid.
-      Fixes bug 18253; bugfix on 0.2.8.1-alpha.

diff --git a/changes/bug18318_ed b/changes/bug18318_ed
deleted file mode 100644 (file)
index 268ad02..0000000
--- a/changes/bug18318_ed
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Major bugfixes (voting):
-    - When generating a vote with keypinning disabled, never include two
-      entries for the same ed25519 identity.  This bug was causing
-      authorities to generate votes that they could not parse when a router
-      violated key pinning by changing its RSA identity but keeping its
-      Ed25519 identity.  Fixes bug 17668; fixes part of bug 18318.  Bugfix on
-      0.2.7.2-alpha.

diff --git a/changes/bug18368 b/changes/bug18368
deleted file mode 100644 (file)
index 628831d..0000000
--- a/changes/bug18368
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (logging):
-    - When logging information about an unparseable networkstatus vote or
-      consensus, do not say "vote" when we mean consensus. Fixes bug
-      18368; bugfix on 0.2.0.8-alpha.
-

diff --git a/changes/bug18548 b/changes/bug18548
deleted file mode 100644 (file)
index 542d331..0000000
--- a/changes/bug18548
+++ /dev/null
@@ -1,12 +0,0 @@
-  o Minor bugfixes (linux seccomp2 sandbox):
-    - Avoid a 10-second delay when starting as a client with "Sandbox 1"
-      enabled and no DNS resolvers configured.  This should help TAILS
-      start up faster. Fixes bug 18548; bugfix on 0.2.5.1-alpha.
-
-
-  o Minor features (linux seccomp2 sandbox):
-    - Detect and reject attempts to change our Address with "Sandbox 1"
-      enabled. Changing Address with Sandbox turned on would never
-      actually work, but previously it would fail in strange and
-      confusing ways.  Found while fixing 18548.
-