[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

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