[tor-commits] [tor/master] Merge branch 'maint-0.3.4' into maint-0.3.5

[nickm at torproject.org]

commit bbdf56aed625b67a8675ad3441afe76198a8a8bc
Merge: a3fc93b8d bfe8f50cc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 2 09:06:38 2018 -0400

    Merge branch 'maint-0.3.4' into maint-0.3.5