commit 04524443d071f3e310067e0a7ecdc52a97e80107 Merge: 736e7299c 2ea573ece Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

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