[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm at torproject.org]

commit 2ea573ece8f168749b40eddcd023b71bf05a4fef
Merge: 7fcb222ab eaaa1108a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 11 16:54:14 2017 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0

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