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

[nickm at torproject.org]

commit 85cd8386fa7da82d453bfb31b39184fbd8d96e08
Merge: d44753b0e 89a3fafd4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 24 10:38:37 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3