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

[nickm at torproject.org]

commit d81a5231eee22d2d73a54b87b9ee13d3896220bc
Merge: 1ec386561 0aa794d30
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Mar 3 11:33:02 2018 -0500

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