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

[nickm at torproject.org]

commit fa726125402ffdd1084f46f82bf74aba162dbc2e
Merge: 36806e983 ef5461044
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 27 10:04:15 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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