From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 26 May 2017 13:00:38 +0000 (-0400)
Subject: Start an 0.3.1.2-alpha mini-changelog
X-Git-Tag: tor-0.3.1.2-alpha~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8cd01f5e5b34cd649726493aca9612cc70dd2ac8;p=thirdparty%2Ftor.git

Start an 0.3.1.2-alpha mini-changelog
---

diff --git a/ChangeLog b/ChangeLog
index 9617af918f..1f2cda0a61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+Changes in version 0.3.1.2-alpha - 2017-05-26
+  Tor 0.3.1.2-alpha is the second release in the 0.3.1.x series. It
+  fixes a couple of bugs found while testing 0.3.1.1-alpha, including a
+  memory corruption bug that affected relay stability.
+
+  o Major bugfixes (relay, crash):
+    - Relays that set MyFamily no longer free the elements of options-
+      >MyFamily while making their descriptor. They tried to access the
+      freed elements, and then double-free them, when making the next
+      descriptor or when changing the config. Fixes bug 22368; bugfix
+      on 0.3.1.1-alpha.
+
+  o Minor bugfixes (logging):
+    - Provide a better log message when a directory authority responds
+      to an upload with an unexpected status code. Fixes bug 11121;
+      bugfix on 0.1.0.1-rc.
+
+  o Minor bugfixes (memory handling):
+    - When directory authorities reject a router descriptor due to
+      keypinning, free the router descriptor rather than leaking the
+      memory. Fixes bug 22370; bugfix on 0.2.7.2-alpha.
+
+
 Changes in version 0.3.1.1-alpha - 2017-05-22
   Tor 0.3.1.1-alpha is the first release in the 0.3.1.x series. It
   reduces the bandwidth usage for Tor's directory protocol, adds some
diff --git a/changes/bug1121 b/changes/bug1121
deleted file mode 100644
index d11ed6451e..0000000000
--- a/changes/bug1121
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (logging):
-    - Provide a better log message when a directory authority responds
-      to an upload with an unexpected status code. Fixes bug 11121;
-      bugfix on 0.1.0.1-rc.
diff --git a/changes/bug22368 b/changes/bug22368
deleted file mode 100644
index eb445d0e43..0000000000
--- a/changes/bug22368
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes:
-    - Relays that set MyFamily no longer free the elements of
-      options->MyFamily while making their descriptor. They tried to
-      access the freed elements, and then double-free them, when making
-      the next descriptor or when changing the config. Fixes bug 22368;
-      bugfix on 0.3.1.1-alpha.
diff --git a/changes/bug22370 b/changes/bug22370
deleted file mode 100644
index e0e87e3339..0000000000
--- a/changes/bug22370
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (memory handling):
-    - When directory authorities reject a router descriptor due to keypinning,
-      free the router descriptor rather than leaking the memory.
-      Fixes bug 22370; bugfix on 0.2.7.2-alpha.