diff options
| author | teor <teor@torproject.org> | 2019-09-05 11:52:52 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-09-05 12:04:27 +1000 |
| commit | c08d3e46ca72c61b11394c7fad5eebf82f48ca4f (patch) | |
| tree | 7fadec28fd1ad7aba2388d2d9e008500be567e1b | |
| parent | 630bb113a0825b4d4ef8a9447b4ff2557a571a1e (diff) | |
| parent | 73890a86ef4b5dc962d647495e7e8c80ca098975 (diff) | |
| download | tor-c08d3e46ca72c61b11394c7fad5eebf82f48ca4f.tar.gz tor-c08d3e46ca72c61b11394c7fad5eebf82f48ca4f.zip | |
Merge commit '73890a86ef' into maint-0.4.1
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.
| -rw-r--r-- | changes/bug30649 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/changes/bug30649 b/changes/bug30649 index 3f5768bcb4..4b2c603171 100644 --- a/changes/bug30649 +++ b/changes/bug30649 @@ -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. |