diff options
| author | teor <teor@torproject.org> | 2019-11-06 11:19:46 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-06 11:19:46 +1000 |
| commit | de6ceb0bee8c1bf56d8929940a109bdc2a2d7521 (patch) | |
| tree | 64cefa8b30b050e26229f307bca8a9d65a7310ae /changes | |
| parent | 4f9a0033920b21882c4b6eead3c55551826ee8e9 (diff) | |
| parent | 03e77ef036e41486b8bfe138d11790c928f49f35 (diff) | |
| download | tor-de6ceb0bee8c1bf56d8929940a109bdc2a2d7521.tar.gz tor-de6ceb0bee8c1bf56d8929940a109bdc2a2d7521.zip | |
Merge branch 'maint-0.4.0' into maint-0.4.1
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug31408 | 5 | ||||
| -rw-r--r-- | changes/bug31837 | 5 |
2 files changed, 10 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. diff --git a/changes/bug31837 b/changes/bug31837 new file mode 100644 index 0000000000..0f976edfe0 --- /dev/null +++ b/changes/bug31837 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - When testing port rebinding, don't busy-wait for tor to log. Instead, + actually sleep for a short time before polling again. Also improve the + formatting of control commands and log messages. + Fixes bug 31837; bugfix on 0.3.5.1-alpha. |