Start a changes file for 0.4.6.2-alpha

16 files changed, 70 insertions, 55 deletions

diff --git a/ChangeLog b/ChangeLog
index ac5aa1e34c..0f8d338b68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,73 @@
+Changes in version 0.4.6.2-alpha - 2021-04-15
+  BLURB HERE
+
+  o Minor features (client):
+    - Clients now check whether their streams are attempting to re-enter
+      the Tor network (i.e. to send Tor traffic over Tor), and they
+      close them preemptively if they think exit relays will refuse
+      them. See ticket 2667 for details. Close ticket 40271.
+
+  o Minor features (command line):
+    - Add long format name --torrc-file for command line option -f.
+      Closes ticket 40324. Patch by Daniel Pinto.
+
+  o Minor features (dormant mode):
+    - Add a new 'DormantTimeoutEnabled' option to allow coarse-grained
+      control over whether the client ever becomes dormant from
+      inactivity. Most people won't need this. Closes ticket 40228.
+
+  o Minor features (fallback directory):
+    - Renegerate the list to a new set of 200 relays acting as fallback
+      directories. Closes ticket 40265.
+
+  o Minor features (geoip data):
+    - Update the geoip files to match the IPFire Location Database, as
+      retrieved on 2021/04/13.
+
+  o Minor features (logging):
+    - Edit heartbeat log messages so that more of them begin with the
+      string "Heartbeat: ". Closes ticket 40322; patch
+      from 'cypherpunks'.
+
+  o Minor bugfixes (bridge, pluggable transport):
+    - Fix a regression that prevented to configure a Bridge line without
+      a fingerprint (which is a normal use case). Fixes bug 40360;
+      bugfix on 0.4.5.4-rc.
+
+  o Minor bugfixes (channel, DoS):
+    - Fix a possible non fatal assertion BUG() due to a too early free
+      of a string when noting down the client connection for the DoS
+      defenses subsystem. Fixes bug 40345; bugfix on 0.4.3.4-rc
+
+  o Minor bugfixes (compilation):
+    - Fix a compilation warning about unused functions when building
+      with a libc that lacks the GLOB_ALTDIRFUNC constant. Fixes bug
+      40354; bugfix on 0.4.5.1-alpha. Patch by Daniel Pinto.
+
+  o Minor bugfixes (configuration):
+    - Fix globbing directories on all platforms when using %include
+      options in configuration files. This patch also fixes compilation
+      on musl libc based systems. Fixes bug 40141; bugfix
+      on 0.4.5.1-alpha.
+
+  o Minor bugfixes (relay):
+    - Move the "overload-general" line from extrainfo to the server
+      descriptor. Fixes bug 40364; bugfix on 0.4.6.1-alpha.
+
+  o Minor bugfixes (testing, BSD):
+    - Fix glob processing errors when globs expand to invalid paths on
+      BSD systems. Fixes bug 40318; bugfix on 0.4.5.1-alpha. Patch by
+      Daniel Pinto.
+
+  o Documentation (manual):
+    - Move the ServerTransport* options to the SERVER OPTIONS` section.
+      Closes issue 40331.
+    - The HiddenServiceStatistics option also applies to bridges so
+      properly indicate that in the tor.1 man page. Closes ticket 40346.
+    - Move the description of "BridgeRecordUsageByCountry" to the
+      section "STATISTICS OPTIONS". Closes ticket 40323.
+
+
 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
diff --git a/changes/bug40141 b/changes/bug40141
deleted file mode 100644
index cf2641cfde..0000000000
--- a/changes/bug40141
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (configuration):
-    - Fix globbing directories on all platforms when using %include options in
-      configuration files. This patch also fixes compilation on musl libc based
-      systems. Fixes bug 40141; bugfix on 0.4.5.1-alpha.
diff --git a/changes/bug40318 b/changes/bug40318
deleted file mode 100644
index cc02f08ca0..0000000000
--- a/changes/bug40318
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (configuration tests bsd):
-    - Fix glob processing errors when globs expand to invalid paths on
-      BSD systems. Fixes bug 40318; bugfix on 0.4.5.1-alpha. Patch by
-      Daniel Pinto.
diff --git a/changes/bug40354 b/changes/bug40354
deleted file mode 100644
index da7c63d3af..0000000000
--- a/changes/bug40354
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (compilation):
-    - Fix a compilation warning about unused functions when building with
-      a libc that lacks the GLOB_ALTDIRFUNC constant. Fixes bug 40354;
-      bugfix on 0.4.5.1-alpha. Patch by Daniel Pinto.
diff --git a/changes/geoip-2021-04-13 b/changes/geoip-2021-04-13
deleted file mode 100644
index db21a1c037..0000000000
--- a/changes/geoip-2021-04-13
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (geoip data):
-    - Update the geoip files to match the IPFire Location Database,
-      as retrieved on 2021/04/13.
diff --git a/changes/ticket-40331 b/changes/ticket-40331
deleted file mode 100644
index c99d704c33..0000000000
--- a/changes/ticket-40331
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation (doc/man/tor.1.txt) :
-     - Move the ServerTransport* options options to the SERVER OPTIONS` section .  
-        Closes issue 40331.
diff --git a/changes/ticket40228 b/changes/ticket40228
deleted file mode 100644
index 297204decd..0000000000
--- a/changes/ticket40228
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (dormant mode):
-    - Add a new 'DormantTimeoutEnabled' option to allow coarse-grained
-      control over whether the client ever becomes dormant from inactivity.
-      Most people won't need this. Closes ticket 40228.
diff --git a/changes/ticket40265 b/changes/ticket40265
deleted file mode 100644
index 2a346d64c3..0000000000
--- a/changes/ticket40265
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor feature (fallback directory):
-    - Renegerate the list to a new set of 200 relays acting as fallback
-      directories. Closes ticket 40265.
diff --git a/changes/ticket40271 b/changes/ticket40271
deleted file mode 100644
index a977be75e1..0000000000
--- a/changes/ticket40271
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features (client):
-    - Clients now check whether their streams are attempting to re-enter
-      the Tor network (i.e. to send Tor traffic over Tor), and they close
-      them preemptively if they think exit relays will refuse them. See
-      ticket 2667 for details. Close ticket 40271.
diff --git a/changes/ticket40322 b/changes/ticket40322
deleted file mode 100644
index 18a65b3323..0000000000
--- a/changes/ticket40322
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (logging):
-    - Edit heartbeat log messages so that more of them begin with the string
-      "Heartbeat: ".  Closes ticket 40322; patch from 'cypherpunks'.
diff --git a/changes/ticket40323 b/changes/ticket40323
deleted file mode 100644
index 83223b2f15..0000000000
--- a/changes/ticket40323
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Documentation (manual):
-    - Move the description of "BridgeRecordUsageByCountry" to the section "STATISTICS OPTIONS". Closes ticket 40323.
diff --git a/changes/ticket40324 b/changes/ticket40324
deleted file mode 100644
index 21c05c6e53..0000000000
--- a/changes/ticket40324
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (cmdline):
-    - Add long format name --torrc-file for command line option -f. Closes
-      ticket 40324. Patch by Daniel Pinto.
diff --git a/changes/ticket40345 b/changes/ticket40345
deleted file mode 100644
index 246e4a86af..0000000000
--- a/changes/ticket40345
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (channel, DoS):
-    - Fix a possible non fatal assertion BUG() due to a too early free of a
-      string when noting down the client connection for the DoS defenses
-      subsystem. Fixes bug 40345; bugfix on 0.4.3.4-rc
-
diff --git a/changes/ticket40346 b/changes/ticket40346
deleted file mode 100644
index c76e6d6aec..0000000000
--- a/changes/ticket40346
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Documentation (man, onion service):
-    - The HiddenServiceStatistics option also applies to bridges so properly
-      indicate that in the tor.1 man page. Closes ticket 40346.
-
diff --git a/changes/ticket40360 b/changes/ticket40360
deleted file mode 100644
index 4a1b2c3446..0000000000
--- a/changes/ticket40360
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (bridge, pluggable transport):
-    - Fix a regression that prevented to configure a Bridge line without a
-      fingerprint (which is a normal use case). Fixes bug 40360; bugfix on
-      0.4.5.4-rc.
-
diff --git a/changes/ticket40364 b/changes/ticket40364
deleted file mode 100644
index 261521a736..0000000000
--- a/changes/ticket40364
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (relay):
-    - Move the "overload-general" line from extrainfo to the server descriptor.
-      Fixes bug 40364; bugfix on 0.4.6.1-alpha.