Start an 0.3.1.2-alpha mini-changelog

1 files changed, 23 insertions, 0 deletions

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