commit ee2e3e852adbfdd780a22f8b186f23ccd6c929e9 Merge: d7eef6114 49b5ad6b7 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 15 14:40:57 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

changes/bug23533 | 4 ++++ src/or/channel.c | 2 +- src/or/channeltls.c | 2 +- src/or/rephist.c | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-)