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