Fold ticket40314 into ChangeLog.

diff --git a/ChangeLog b/ChangeLog
index 965f2001d82730e073b214dcf76e4f799b40cf72..eea5d88b60cbc008f03b1a37a2bc3b1819ca74ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,12 @@
-Changes in version 0.4.6.1-alpha - 2021-03-??
+Changes in version 0.4.6.1-alpha - 2021-03-18
   Tor 0.4.6.1-alpha is the first alpha release in the 0.4.6.x series. It
   improves client circuit performance, adds missing features, and
   improves some of our DoS handling and statistics reporting. It also
   includes numerous smaller bugfixes.
 
+  Below are the changes since 0.4.5.7. (Note that this release DOES
+  include the fixes for the security bugs already fixed in 0.4.5.7.)
+
   o Major features (control port, onion services):
     - Add controller support for creating version 3 onion services with
       client authorization. Previously, only v2 onion services could be
@@ -101,6 +104,11 @@ Changes in version 0.4.6.1-alpha - 2021-03-??
       versions of python. Closes ticket 40213. Patch from
       Samanta Navarro.
 
+  o Minor features (vote document):
+    - Add a "stats" line to directory authority votes, to report various
+      statistics that authorities computed about the relays. This will
+      help us diagnose the network better. Closes ticket 40314.
+
   o Minor bugfixes (build):
     - Mini-report in the configure script now shows whether or not lzma
       and zstd have been used, not just if enable flag passed in. Fixes

diff --git a/changes/ticket40314 b/changes/ticket40314
deleted file mode 100644 (file)
index 328687c..0000000
--- a/changes/ticket40314
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor feature (Vote document):
-    - Add the "stats" line in a directory authority vote in order to report
-      various statistics that the authority has computed for the relays. This
-      will help us diagnose better the network. Close ticket 40314.