commit b077ccde4e890110ddfa9304d5badf261a2942b9 Merge: 3ec72ef52 bc1ea4f47 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 16:54:13 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

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