commit 40deb99c542b9b3b7d29281b68660998a514d50d Merge: bf33ddd29 a54e94878 Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 6 10:39:59 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

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