[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm at torproject.org]

commit 65a6103afc39890f41f6f5e7ba7e4ef570af1622
Merge: d45bf0c65 735855952
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Nov 18 11:02:58 2017 -0500

    Merge branch 'maint-0.3.1' into maint-0.3.2
    
    "Ours" merge to avoid taking ticket18329_minimal_025