commit b22b60365f2d7db2db31128fa733c67d6f52fb8c Merge: 103076a75 9aeef05f8 Author: Nick Mathewson nickm@torproject.org Date: Sun Jul 1 10:22:20 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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