Fold new entries into changelog

6 files changed, 13 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 4f817e4152..5559e05f72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,13 @@ Changes in version 0.2.7.3-rc - 2015-09-2?
       messages are better, and the code can recover from far more
       failure conditions. Thanks to "s7r" for reporting and diagnosing
       so many of these!
+    - Add a new OfflineMasterKey option to tell Tor never to try loading
+      or generating a secret ed25519 identity key. You can use this in
+      combination with tor --keygen to manage offline and/or encrypted
+      ed25519 keys. Implements ticket 16944.
+    - Add a --newpass option to allow changing or removing the
+      passphrase of an encrypted key with tor --keygen. Implements part
+      of ticket 16769.
     - On receiving a HUP signal, check to see whether the Ed25519
       signing key has changed, and reload it if so. Closes ticket 16790.
 
@@ -59,9 +66,12 @@ Changes in version 0.2.7.3-rc - 2015-09-2?
   o Minor features (compilation):
     - Give a warning as early as possible when trying to build with an
       unsupported OpenSSL version. Closes ticket 16901.
+    - Fail during configure if we're trying to build against an OpenSSL
+      built without ECC support. Fixes bug 17109, bugfix on 0.2.7.1-alpha
+      which started requiring ECC.
 
   o Minor features (geoip):
-    - Update geoip and geoip6 to the July 8 2015 Maxmind GeoLite2
+    - Update geoip and geoip6 to the September 3 2015 Maxmind GeoLite2
       Country database.
 
   o Minor features (hidden services):
@@ -128,6 +138,8 @@ Changes in version 0.2.7.3-rc - 2015-09-2?
       incorrectly removed. Fixes bug 16924; bugfix on 0.2.4.4-alpha.
 
   o Minor bugfixes (documentation):
+    - Advise users how to configure separate IPv4 and IPv6 exit policies
+      in the manpage and sample torrcs. Related to ticket 16069.
     - Fix the usage message of tor-resolve(1) so that it no longer lists
       the removed -F option. Fixes bug 16913; bugfix on 0.2.2.28-beta.
     - Fix an error in the manual page and comments for
diff --git a/changes/bug17109 b/changes/bug17109
deleted file mode 100644
index 9f80f6ef16..0000000000
--- a/changes/bug17109
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Fail during configure if we're trying to build against an OpenSSL
-      built without ECC support. Fixes bug 17109, bugfix on
-      0.2.7.1-alpha which started requiring ECC.
diff --git a/changes/feature16769 b/changes/feature16769
deleted file mode 100644
index acb2b9c0da..0000000000
--- a/changes/feature16769
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (ed25519):
-    - Add a --newpass option to allow changing or removing the
-      passphrase of an encrypted key with tor --keygen. Implements
-      part of ticket 16769.
diff --git a/changes/feature16944 b/changes/feature16944
deleted file mode 100644
index 1728beff7f..0000000000
--- a/changes/feature16944
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features (relay, ed25519):
-    - Add a new OfflineMasterKey option to tell Tor never to try
-      loading or generating a secret ed25519 identity key. You can use
-      this in combination with tor --keygen to manage offline and/or
-      encrypted ed25519 keys. Implements ticket 16944.
diff --git a/changes/geoip-september2015 b/changes/geoip-september2015
deleted file mode 100644
index a4f99efaa2..0000000000
--- a/changes/geoip-september2015
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update geoip and geoip6 to the September 3 2015 Maxmind GeoLite2 Country database.
-
diff --git a/changes/ipv6-exitpolicy-docs b/changes/ipv6-exitpolicy-docs
deleted file mode 100644
index 033c28385f..0000000000
--- a/changes/ipv6-exitpolicy-docs
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Minor bug fixes (documentation, torrc exit policies):
-    - Advise users how to configure separate IPv4 and IPv6 exit
-      policies in the manpage and sample torrcs.
-    - Fixup formatting errors in the documentation changes from
-      tickets #16069 and #17027.
-      Related to fixes in ticket #16069 and #17027. Patch by "teor".
-      Patch on 2eb7eafc9d78 and a96c0affcb4c (25 Oct 2012),
-      released in 0.2.4.7-alpha.