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