[tor-commits] [tor/master] changes: use correct bugfix release, and reword changes file for 31408

[nickm at torproject.org]

commit 0614f839054a52e6e1a79a366fcc70da0691df66
Author: teor <teor at torproject.org>
Date:   Mon Sep 23 11:11:50 2019 +1000

    changes: use correct bugfix release, and reword changes file for 31408
---
 changes/bug31408 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/changes/bug31408 b/changes/bug31408
index 7a6744cee..3e4ffa927 100644
--- a/changes/bug31408
+++ b/changes/bug31408
@@ -1,4 +1,5 @@
   o Major bugfixes (torrc):
-    - Fix configuration files in a %included folder containing a 
-      configuration file with only comments or whitespace being
-      ignored. Fixes bug 31408; bugfix on 0.4.0.5.
+    - Stop ignoring torrc options after an %include directive, when the
+      included directory ends with a file that does not contain any config
+      options. (But does contain comments or whitespace.)
+      Fixes bug 31408; bugfix on 0.3.1.1-alpha.