[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

[nickm at torproject.org]

commit 990322fca450d2230067a3035468c5ac7168e760
Merge: 38a58076e 7bebd1b02
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 24 09:11:33 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1
    
    "ours" merge to avoid version bump