commit eaaa1108a3eb1271ad2c8f3fbb8a6845d24de874 Merge: 7e486dd6f bc1ea4f47 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 16:54:14 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

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