diff options
author | teor <teor@torproject.org> | 2019-11-06 11:19:38 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-11-06 11:19:38 +1000 |
commit | 03e77ef036e41486b8bfe138d11790c928f49f35 (patch) | |
tree | 637844fa0ea98b61df95dc2985f2cbfe62580a04 /changes | |
parent | 54e2d0dc2d790a9e84ec44db2d53d535d8076602 (diff) | |
parent | 1bde356bf645f3c3d3b0a6e70c03e2baf9f89d26 (diff) | |
download | tor-03e77ef036e41486b8bfe138d11790c928f49f35.tar.gz tor-03e77ef036e41486b8bfe138d11790c928f49f35.zip |
Merge branch 'maint-0.3.5' into maint-0.4.0
Diffstat (limited to 'changes')
-rw-r--r-- | changes/bug30916 | 4 | ||||
-rw-r--r-- | changes/bug31107 | 4 | ||||
-rw-r--r-- | changes/bug31408 | 5 | ||||
-rw-r--r-- | changes/bug31837 | 5 | ||||
-rw-r--r-- | changes/ticket31466 | 5 |
5 files changed, 23 insertions, 0 deletions
diff --git a/changes/bug30916 b/changes/bug30916 new file mode 100644 index 0000000000..b006bfc75d --- /dev/null +++ b/changes/bug30916 @@ -0,0 +1,4 @@ + o Minor bugfixes (relay): + - Avoid crashing when starting with a corrupt keys directory where + the old ntor key and the new ntor key are identical. Fixes bug 30916; + bugfix on 0.2.4.8-alpha. diff --git a/changes/bug31107 b/changes/bug31107 new file mode 100644 index 0000000000..9652927c30 --- /dev/null +++ b/changes/bug31107 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging, protocol violations): + - Do not log a nonfatal assertion failure when receiving a VERSIONS + cell on a connection using the obsolete v1 link protocol. Log a + protocol_warn instead. Fixes bug 31107; bugfix on 0.2.4.4-alpha. 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. diff --git a/changes/ticket31466 b/changes/ticket31466 new file mode 100644 index 0000000000..e535b4502e --- /dev/null +++ b/changes/ticket31466 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging): + - Rate-limit our the logging message about the obsolete .exit notation. + Previously, there was no limit on this warning, which could potentially + be triggered many times by a hostile website. Fixes bug 31466; + bugfix on 0.2.2.1-alpha. |