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

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