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

[nickm at torproject.org]

commit 0be10dde5aef4859dff04db23cf263c026e3f1c9
Merge: ab1c182 c1bdc3b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 7 10:57:27 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1