commit 8edbeb26bb90142408c55eb62dbf1a8993f38d6f Merge: 94871f75d be3a962ca Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jul 20 10:42:29 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket26647 | 4 ++++ src/or/control.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)