[tor-commits] [tor/maint-0.4.1] Merge commit '73890a86ef' into maint-0.4.1

[teor at torproject.org]

commit c08d3e46ca72c61b11394c7fad5eebf82f48ca4f
Merge: 630bb113a 73890a86e
Author: teor <teor at torproject.org>
Date:   Thu Sep 5 11:52:52 2019 +1000

    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.

 changes/bug30649 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)