commit c00527b3aee015eed559da89c6e4a1c096e50c56 Merge: 3223e303f cf8c3abff Author: Nick Mathewson <nickm@torproject.org> Date: Sun Jul 1 10:22:21 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug26523 | 5 +++++ src/or/control.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-)