torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '73890a86ef' into maint-0.4.1

Browse Source 
tor-github/pr/1283, with the following changes:
* cherry-pick the merge commit in 1283 on top of...
* tor-github/pr/1174, but with the last commit re-worded to remove
    the fixup, because fixups break our push rules.

This is an "ours" merge, except for the bugfix version change in
changes/bug30649.
This commit is contained in:
teor
2019-09-05 11:52:52 +10:00
parent 630bb113a0 73890a86ef
commit c08d3e46ca
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug30649
+1 -1
View File
@@ -1,4 +1,4 @@
o Minor bugfixes (circuit padding):
- On relays, properly check that a padding machine is absent before
logging a warn about it being absent. Fixes bug 30649;
bugfix on 0.4.1.1-alpha.
bugfix on 0.4.0.1-alpha.