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

[nickm at torproject.org]

commit c78904b6302c53e0778854974c13aa4d5a499bb0
Merge: 6851a0809 b063ca060
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 24 12:57:14 2018 -0400

    Merge branch 'maint-0.3.4' into maint-0.3.5
    
    "ours" to avoid taking a second instance of 27797.