summaryrefslogtreecommitdiff
path: root/changes/bug31408
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-11-06 11:19:38 +1000
committerteor <teor@torproject.org>2019-11-06 11:19:38 +1000
commit03e77ef036e41486b8bfe138d11790c928f49f35 (patch)
tree637844fa0ea98b61df95dc2985f2cbfe62580a04 /changes/bug31408
parent54e2d0dc2d790a9e84ec44db2d53d535d8076602 (diff)
parent1bde356bf645f3c3d3b0a6e70c03e2baf9f89d26 (diff)
downloadtor-03e77ef036e41486b8bfe138d11790c928f49f35.tar.gz
tor-03e77ef036e41486b8bfe138d11790c928f49f35.zip
Merge branch 'maint-0.3.5' into maint-0.4.0
Diffstat (limited to 'changes/bug31408')
-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.