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

[nickm at torproject.org]

commit 92c60b572ce89e6988422df81af7e8fbcbf2d102
Merge: bcea98a4b 9d1c7c3a8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 19 05:39:56 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/bug25479 | 4 ++++
 src/test/bench.c | 2 ++
 2 files changed, 6 insertions(+)