aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-11-06 11:17:43 +1000
committerteor <teor@torproject.org>2019-11-06 11:17:43 +1000
commit0e2834a3718a3932cfe8d3148d203a0604451073 (patch)
tree118f1936883ac2fe26c104218f3b4b15627f3220 /changes
parentd2e4262ebc134f4c6ae9e702a14da45489575b4f (diff)
parent0614f839054a52e6e1a79a366fcc70da0691df66 (diff)
downloadtor-0e2834a3718a3932cfe8d3148d203a0604451073.tar.gz
tor-0e2834a3718a3932cfe8d3148d203a0604451073.zip
Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5
Diffstat (limited to 'changes')
-rw-r--r--changes/bug314085
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug31408 b/changes/bug31408
new file mode 100644
index 0000000000..3e4ffa927d
--- /dev/null
+++ b/changes/bug31408
@@ -0,0 +1,5 @@
+ o Major bugfixes (torrc):
+ - 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.