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

[nickm at torproject.org]

commit abf88af4887782f6952d90755d64f946d4958e6d
Merge: 258460466 a54e94878
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 6 10:39:59 2018 -0400

    Merge branch 'maint-0.3.4'

 changes/bug26994      |  3 +++
 src/test/test_bwmgt.c | 35 ++++++++++++++++++++---------------
 2 files changed, 23 insertions(+), 15 deletions(-)