commit adcd1d8b9ac09f3abc11e2e3187fe363ad3df2fd Merge: c03958dbc cf8c3abff Author: Nick Mathewson nickm@torproject.org Date: Sun Jul 1 10:22:21 2018 -0400

Merge branch 'maint-0.3.4'

changes/bug26523 | 5 +++++ src/or/control.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-)