commit 702a13c9d34c413bef64aadef4853ea2acd9781f Merge: fe04a19cb 6dc784bdb Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 14 14:45:11 2017 -0500 Merge branch 'maint-0.3.2' changes/bug24230 | 4 ++++ src/or/control.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)