diff options
author | teor <teor@torproject.org> | 2020-02-12 12:21:57 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2020-02-12 12:21:57 +1000 |
commit | 5298113da98f13cfaad4a9ab7b5ac8baa6c37279 (patch) | |
tree | a85d0e8f6be3c4195f538592718d7c7ef5e2b612 /changes | |
parent | 0ff3e8f4a0fd5b661e999c0a81ceb1c55e7456c6 (diff) | |
parent | b9c7c61ea5233854ff83257a8bc530b7e0a50351 (diff) | |
download | tor-5298113da98f13cfaad4a9ab7b5ac8baa6c37279.tar.gz tor-5298113da98f13cfaad4a9ab7b5ac8baa6c37279.zip |
Merge branch 'maint-0.3.5' into maint-0.4.1
Diffstat (limited to 'changes')
-rw-r--r-- | changes/bug32753 | 3 | ||||
-rw-r--r-- | changes/ticket33075 | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug32753 b/changes/bug32753 new file mode 100644 index 0000000000..6f59c7729d --- /dev/null +++ b/changes/bug32753 @@ -0,0 +1,3 @@ + o Minor bugfixes (bridges): + - Lowercase the value of BridgeDistribution from torrc before adding it to + the descriptor. Fixes bug 32753; bugfix on 0.3.2.3-alpha. diff --git a/changes/ticket33075 b/changes/ticket33075 new file mode 100644 index 0000000000..69698d90b3 --- /dev/null +++ b/changes/ticket33075 @@ -0,0 +1,4 @@ + o Testing: + - Stop allowing failures on the Travis CI stem tests job. It looks like all + the stem hangs we were seeing are now fixed, but let's make sure we see + them if they happen again. Closes ticket 33075. |