commit e11830b2b4d3f15fd73703b5f4a7c784d09456f7 Merge: ebf4f3f82 2ea573ece Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 11 16:54:14 2017 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/ticket23856 | 4 ++++ src/or/rephist.c | 4 ++-- src/or/router.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)