commit f5d4bdf305d2341f7ff531fc9c8ed08511bd503d Merge: 461e34bb3 8be50ca3e Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 16:53:02 2017 -0500

Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5

changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)