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

[nickm at torproject.org]

commit 0d5aaef465f782d46f538b03fd962ba7007fca11
Merge: fa38bbb70 cff7cb858
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 7 15:12:27 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4
    
    "ours" to avoid bump.