commit b23086060866c1541a607e0e9082ef9d9464549e Merge: 722c64fc2 ef5461044 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 27 10:04:16 2017 -0500

Merge branch 'maint-0.3.2'

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