fold in changes for 0.2.5.6-alpha so far

10 files changed, 51 insertions, 57 deletions

diff --git a/ChangeLog b/ChangeLog
index 5450f6ae69..b3787b85fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,54 @@
-Changes in version 0.2.5.6-?? - 2014-0?-??
+Changes in version 0.2.5.6-alpha - 2014-07-2?
+  Tor 0.2.5.6-alpha fixes [...]
+
+  o Major features (also in 0.2.4.23):
+    - Make the number of entry guards configurable via a new
+      NumEntryGuards consensus parameter, and the number of directory
+      guards configurable via a new NumDirectoryGuards consensus
+      parameter. Implements ticket 12688.
+
+  o Major bugfixes (also in 0.2.4.23):
+    - Fix a bug in the bounds-checking in the 32-bit curve25519-donna
+      implementation that caused incorrect results on 32-bit
+      implementations when certain malformed inputs were used along with
+      a small class of private ntor keys. This bug does not currently
+      appear to allow an attacker to learn private keys or impersonate a
+      Tor server, but it could provide a means to distinguish 32-bit Tor
+      implementations from 64-bit Tor implementations. Fixes bug 12694;
+      bugfix on 0.2.4.8-alpha. Bug found by Robert Ransom; fix from
+      Adam Langley.
+
+  o Major bugfixes:
+    - Perform circuit cleanup operations even when circuit
+      construction operations are disabled (because the network is
+      disabled, or because there isn't enough directory information).
+      Previously, when we were not building predictive circuits, we
+      were not closing expired circuits either. Fixes bug 8387; bugfix on
+      0.1.1.11-alpha. This bug became visible in 0.2.4.10-alpha when we
+      became more strict about when we have "enough directory information
+      to build circuits".
+
+  o Minor features:
+    - Authorities now assign the Guard flag to the fastest 25% of the
+      network (it used to be the fastest 50%). Also raise the consensus
+      weight that guarantees the Guard flag from 250 to 2000. For the
+      current network, this results in about 1100 guards, down from 2500.
+      This step paves the way for moving the number of entry guards
+      down to 1 (proposal 236) while still providing reasonable expected
+      performance for most users. Implements ticket 12690.
+    - Update geoip and geoip6 to the July 10 2014 Maxmind GeoLite2
+      Country database.
+    - Slightly enhance the diagnostic message for bug 12184.
+
+  o Minor bugfixes:
+    - Fix compilation when building with bufferevents enabled. (This
+      configuration is still not expected to work, however.)
+      Fixes bugs 12438, 12474, 11578; bugfixes on 0.2.5.1-alpha and
+      0.2.5.3-alpha. Patches from Anthony G. Basile and Sathyanarayanan
+      Gunasekaran.
+    - Compile correctly with builds and forks of OpenSSL (such as
+      LibreSSL) that disable compression. Fixes bug 12602; bugfix on
+      0.2.1.1-alpha. Patch from "dhill".
 
 
 Changes in version 0.2.5.5-alpha - 2014-06-18
diff --git a/changes/bufferevent_compilation b/changes/bufferevent_compilation
deleted file mode 100644
index 3a328731fe..0000000000
--- a/changes/bufferevent_compilation
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-    - Fix compilation when building with bufferevents enabled. (This
-      configuration is still not expected to work, however.)
-      Fixes bugs 12438, 12474, 11578; bugfixes on 0.2.5.1-alpha and
-      0.2.5.3-alpha. Patches from Anthony G. Basile and Sathyanarayanan
-      Gunasekaran.
diff --git a/changes/bug12602 b/changes/bug12602
deleted file mode 100644
index 29fa49ac45..0000000000
--- a/changes/bug12602
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (portability):
-    - Compile correctly with builds and forks of OpenSSL (such as
-      LibreSSL) that disable compression. Fixes bug 12602; bugfix on
-      0.2.1.1-alpha. Patch from "dhill".
-
diff --git a/changes/bug8387 b/changes/bug8387
deleted file mode 100644
index 2ec0487bf8..0000000000
--- a/changes/bug8387
+++ /dev/null
@@ -1,11 +0,0 @@
-  o Major bugfixes (client):
-
-    - Perform circuit cleanup operations even when circuit
-      construction operations are disabled (because the network is
-      disabled, or because there isn't enough directory information).
-      Previously, when we were not building predictive circuits, we
-      were not closing expired circuits either.
-
-      Fixes bug 8387; bugfix on 0.1.1.11-alpha. This bug became visible
-      in 0.2.4.10-alpha when we became more strict about when we have
-      "enough directory information to build circuits".
diff --git a/changes/curve25519-donna32-bug b/changes/curve25519-donna32-bug
deleted file mode 100644
index 7fccab1b0c..0000000000
--- a/changes/curve25519-donna32-bug
+++ /dev/null
@@ -1,12 +0,0 @@
-  o Major bugfixes:
-
-    - Fix a bug in the bounds-checking in the 32-bit curve25519-donna
-      implementation that caused incorrect results on 32-bit
-      implementations when certain malformed inputs were used along with
-      a small class of private ntor keys. This bug does not currently
-      appear to allow an attacker to learn private keys or impersonate a
-      Tor server, but it could provide a means to distinguish 32-bit Tor
-      implementations from 64-bit Tor implementations. Fixes bug 12694;
-      bugfix on 0.2.4.8-alpha. Bug found by Robert Ransom; fix from
-      Adam Langley.
-
diff --git a/changes/further-12184-diagnostic b/changes/further-12184-diagnostic
deleted file mode 100644
index 89e9f4612f..0000000000
--- a/changes/further-12184-diagnostic
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Minor features (diagnostic):
-    - Slightly enhance the diagnostic message for bug 12184.
diff --git a/changes/geoip-july2014 b/changes/geoip-july2014
deleted file mode 100644
index a0523ecac9..0000000000
--- a/changes/geoip-july2014
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update geoip to the July 10 2014 Maxmind GeoLite2 Country database.
-
diff --git a/changes/geoip6-july2014 b/changes/geoip6-july2014
deleted file mode 100644
index 155788ef88..0000000000
--- a/changes/geoip6-july2014
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Minor features:
-    - Update geoip6 to the July 10 2014 Maxmind GeoLite2 Country database.
diff --git a/changes/ticket12688 b/changes/ticket12688
deleted file mode 100644
index 88228e5506..0000000000
--- a/changes/ticket12688
+++ /dev/null
@@ -1,6 +0,0 @@
-  Major features:
-    - Make the number of entry guards configurable via a new
-      NumEntryGuards consensus parameter, and the number of directory
-      guards configurable via a new NumDirectoryGuards consensus
-      parameter. Implements ticket 12688.
-
diff --git a/changes/ticket12690 b/changes/ticket12690
deleted file mode 100644
index 5091883602..0000000000
--- a/changes/ticket12690
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Minor features:
-    - Authorities now assign the Guard flag to the fastest 25% of the
-      network (it used to be the fastest 50%). Also raise the consensus
-      weight that guarantees the Guard flag from 250 to 2000. For the
-      current network, this results in about 1100 guards, down from 2500.
-      This step paves the way for moving the number of entry guards
-      down to 1 (proposal 236) while still providing reasonable expected
-      performance for most users. Implements ticket 12690.
-