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

[nickm at torproject.org]

commit 36885f34f6e8dc7f5791e4ba2c4eefff5f9de9e0
Merge: cdaf9aec8 da29074fc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 7 15:11:49 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.2
    
    "ours" to avoid bump