Collate and format entries for changelog for 0.2.6.10

More editing needed.

8 files changed, 44 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ed406a11d..9605b7e75a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,47 @@
+Changes in version 0.2.6.10 - 2015-07-14
+  Tor version 0.2.6.10 fixes some significant stability and hidden
+  service client bugs, bulletproofs the cryptography init process, and .
+  Everyone running an older version, especially an older version of
+  0.2.6, should upgrade.
+
+  o Major bugfixes (crypto error-handling):
+    - If crypto_early_init fails, a typo in a return value from tor_init
+      means that tor_main continues running, rather than returning an
+      error value. Fixes bug 16360; bugfix on 0.2.5.2-alpha, introduced
+      when implementing 4900. Patch by "teor".
+
+  o Major bugfixes (hidden service clients, stability):
+    - Revert commit 9407040c592184 of bug 14219 that indeed fixed an
+      issue but introduced a major hidden service reachability
+      regression detailed in bug 16381. This is a temporary fix since we
+      can live with the minor issue in #14219 but the regression
+      introduced is too much of a set back.
+
+      To be clear, 14219 bug just results in some load on the network,
+      and some delay for the client when visiting a hidden service that
+      will ultimately fail.
+
+      Workaround for bug 16381; bugfix on tor-0.2.6.3-alpha~138.
+
+  o Major bugfixes (stability):
+    - Do not crash with an assertion error when parsing certain kinds of
+      malformed or truncated microdescriptors. Fixes bug 16400; bugfix
+      on 0.2.6.1-alpha. Found by "torkeln"; fix based on a patch
+      by "cypherpunks_backup".
+    - Stop randomly crashing with an assertion failure when connecting
+      to a busy hidden service, or connecting to a hidden service while
+      a NEWNYM is in progress. Fixes bug 16013; bugfix on 0.1.0.1-rc.
+
+  o Minor features:
+    - Update geoip to the June 3 2015 Maxmind GeoLite2 Country database.
+    - Update geoip6 to the June 3 2015 Maxmind GeoLite2 Country database.
+
+  o Minor bugfixes (Linux seccomp2 sandbox):
+    - Allow pipe() and pipe2() syscalls; we need these when eventfd2()
+      support is missing. Fixes bug 16363; bugfix on 0.2.6.3-alpha.
+      Patch from "teor".
+
+
 Changes in version 0.2.6.9 - 2015-06-11
   Tor 0.2.6.9 fixes a regression in the circuit isolation code, increases the
   requirements for receiving an HSDir flag, and addresses some other small
diff --git a/changes/bug16013 b/changes/bug16013
deleted file mode 100644
index d194c609f8..0000000000
--- a/changes/bug16013
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes (hidden service, stability):
-    - Stop randomly crashing with an assertion failure when connecting to a
-      busy hidden service, or connecting to a hidden service while a NEWNYM
-      is in progress. Fixes bug 16013; bugfix on 0.1.0.1-rc.
-
diff --git a/changes/bug16360-failed-crypto-early-init b/changes/bug16360-failed-crypto-early-init
deleted file mode 100644
index 21972bce52..0000000000
--- a/changes/bug16360-failed-crypto-early-init
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (crypto error-handling):
-    - If crypto_early_init fails, a typo in a return value from tor_init
-      means that tor_main continues running, rather than returning
-      an error value.
-      Fixes bug 16360; bugfix on d3fb846d8c98 in 0.2.5.2-alpha,
-      introduced when implementing #4900.
-      Patch by "teor".
diff --git a/changes/bug16363 b/changes/bug16363
deleted file mode 100644
index 1a6f8c6eff..0000000000
--- a/changes/bug16363
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (Linux seccomp2 sandbox):
-    - Allow pipe() and pipe2() syscalls; we need these when eventfd2()
-      support is missing. Fixes bug 16363; bugfix on 0.2.6.3-alpha.
-      Patch from "teor".
diff --git a/changes/bug16381 b/changes/bug16381
deleted file mode 100644
index 51a9b53007..0000000000
--- a/changes/bug16381
+++ /dev/null
@@ -1,13 +0,0 @@
-  o Major bugfix (Hidden service client)
-    - Revert commit 9407040c592184e05e45a3c1a00739c2dd302288 of bug #14219
-      that indeed fixed an issue but introduced a major hidden service
-      reachability regression detailed in bug #16381. This is a temporary
-      fix since we can live with the minor issue in #14219 but the
-      regression introduced is too much of a set back.
-
-      To be clear, #14219 bug just results in some load on the network, and
-      some delay for the client when visiting a hidden service that will
-      ultimately fail.
-
-      This is only a bandaid for #16381 thus it does _not_ fixes it. bugfix
-      on tor-0.2.6.3-alpha~138.
diff --git a/changes/bug16400 b/changes/bug16400
deleted file mode 100644
index 3e5f9c5843..0000000000
--- a/changes/bug16400
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes:
-   - Do not crash with an assertion error when parsing certain kinds
-     of malformed or truncated microdescriptors. Fixes bug 16400;
-     bugfix on 0.2.6.1-alpha. Found by "torkeln"; fix based on a patch by
-     "cypherpunks_backup".
diff --git a/changes/geoip-june2015 b/changes/geoip-june2015
deleted file mode 100644
index 9d6cd3658b..0000000000
--- a/changes/geoip-june2015
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update geoip to the June 3 2015 Maxmind GeoLite2 Country database.
-
diff --git a/changes/geoip6-june2015 b/changes/geoip6-june2015
deleted file mode 100644
index 527dbff53b..0000000000
--- a/changes/geoip6-june2015
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update geoip6 to the June 3 2015 Maxmind GeoLite2 Country database.
-