commit 60bc9675da30e266f9d22e2db3db5adaaa73f6d0 Merge: 57ff37430 15e752e6b Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 15 16:56:11 2018 -0500

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug24104 | 4 ++ src/or/rephist.c | 7 ++- src/or/rephist.h | 5 +- src/or/router.c | 24 +++++++-- src/test/log_test_helpers.c | 23 +++++++- src/test/log_test_helpers.h | 8 ++- src/test/test_router.c | 124 +++++++++++++++++++++++++++++++++++++++++++- 7 files changed, 179 insertions(+), 16 deletions(-)