commit 6108499c99aa3cfa5ed7909720630857768c43b1 Merge: 636b5d19a 7a83cf75d Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 8 08:24:47 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

changes/bug22644 | 5 +++++ src/or/control.c | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-)