Fold new entries into an 0.3.0.6 changelog.

5 files changed, 38 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index baa8be69a4..6c2c47f1cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,25 @@
-Changes in version 0.3.0.6-rc - 2017-0?-??
+Changes in version 0.3.0.6 - 2017-04-2?
+  Tor 0.3.0.6 is the first stable release of the Tor 0.2.9 series.
+
+  XXXXX BLURB HERE.
+
+  Below are the changes since 0.3.0.5-rc. For a list of all changes
+  since 0.2.9, see the ReleaseNotes file.
+
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the April 4 2017 Maxmind GeoLite2
+      Country database.
+
+  o Minor bugfixes (control port):
+    - The GETINFO extra-info/digest/<digest> command was broken because
+      of a wrong base16 decode return value check, introduced when
+      refactoring that API. Fixes bug 22034; bugfix on 0.2.9.1-alpha.
+
+  o Minor bugfixes (crash prevention):
+    - Fix an (currently untriggerable, but potentially dangerous) crash
+      bug when base32-encoding inputs whose sizes are not a multiple of
+      5. Fixes bug 21894; bugfix on 0.2.9.1-alpha.
+
 
 Changes in version 0.3.0.5-rc - 2017-04-05
   Tor 0.3.0.5-rc fixes a few remaining bugs, large and small, in the
diff --git a/Release-030-in b/Release-030-in
index ec773b5a3c..dacecb2eaa 100644
--- a/Release-030-in
+++ b/Release-030-in
@@ -1,5 +1,10 @@
-Changes in version 0.3.0.6 - 2017-04-??
-  draft draft draft
+Changes in version 0.3.0.6 - 2017-04-2?
+  Tor 0.3.0.6 is the first stable release of the Tor 0.3.0 series.
+
+  XXXXX BLURB HERE.
+
+  Below are the changes since 0.2.9.10. For a list of only the changes
+  since 0.3.0.5-rc, see the ChangeLog file.
 
   o Major features (directory authority, security):
     - The default for AuthDirPinKeys is now 1: directory authorities
@@ -223,9 +228,7 @@ Changes in version 0.3.0.6 - 2017-04-??
       secrecy, we used P256.) Closes ticket 13752.
 
   o Minor features (geoip):
-    - Update geoip and geoip6 to the February 8 2017 Maxmind GeoLite2
-      Country database.
-    - Update geoip and geoip6 to the March 7 2017 Maxmind GeoLite2
+    - Update geoip and geoip6 to the April 4 2017 Maxmind GeoLite2
       Country database.
 
   o Minor features (geoip, also in 0.2.9.9):
@@ -273,6 +276,9 @@ Changes in version 0.3.0.6 - 2017-04-??
       breaking change in the control protocol. (The field seems to be
       ignored by the most common known controllers.) Fixes bug 18146;
       bugfix on 0.1.1.4-alpha.
+    - The GETINFO extra-info/digest/<digest> command was broken because
+      of a wrong base16 decode return value check, introduced when
+      refactoring that API. Fixes bug 22034; bugfix on 0.2.9.1-alpha.
 
   o Minor bugfix (logging):
     - Don't recommend the use of Tor2web in non-anonymous mode.
@@ -335,6 +341,11 @@ Changes in version 0.3.0.6 - 2017-04-??
       the end (happens in small testing networks) and causing an error.
       Fixes bug 14881; bugfix on 0.2.2.17-alpha.
 
+  o Minor bugfixes (crash prevention):
+    - Fix an (currently untriggerable, but potentially dangerous) crash
+      bug when base32-encoding inputs whose sizes are not a multiple of
+      5. Fixes bug 21894; bugfix on 0.2.9.1-alpha.
+
   o Minor bugfixes (dead code):
     - Remove a redundant check for PidFile changes at runtime in
       options_transition_allowed(): this check is already performed
diff --git a/changes/bug21894_029 b/changes/bug21894_029
deleted file mode 100644
index e3a84fa721..0000000000
--- a/changes/bug21894_029
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (crash prevention):
-    - Fix an (currently untriggerable, but potentially dangerous) crash
-      bug when base32-encoding inputs whose sizes are not a multiple of
-      5. Fixes bug 21894; bugfix on 0.2.9.1-alpha.
-
diff --git a/changes/bug22034 b/changes/bug22034
deleted file mode 100644
index 6d9e188740..0000000000
--- a/changes/bug22034
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (control port, regression):
-    - The GETINFO extra-info/digest/<digest> command was broken because of a
-      wrong base16 decode return value check. In was introduced in a refactor
-      of that API. Fixex bug #22034; bugfix on tor-0.2.9.1-alpha.
diff --git a/changes/geoip-april2017 b/changes/geoip-april2017
deleted file mode 100644
index b489eaf016..0000000000
--- a/changes/geoip-april2017
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-    - Update geoip and geoip6 to the April 4 2017 Maxmind GeoLite2
-      Country database.
-