[tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5

[nickm at torproject.org]

commit 1b4075cb272a6f9a14cd0e0b8c73d359666fc479
Merge: 8af8ecabb fe1fb4b0c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 15 17:08:04 2018 -0500

    Merge branch 'maint-0.3.4' into maint-0.3.5
    
    "ours" merge to avoid taking 25573 and 27686 again.