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

[nickm at torproject.org]

commit 9b9625bdfa0b69485ba9e34c57879abc15b71458
Merge: 32d9d6935 fead22fb2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 9 09:09:01 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4