commit 08cc2cc692ac12c64dff992d68ffde55c7b95202 Merge: 7ebb1ba2c ca2d9cbb9 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 26 10:32:53 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug24903 | 5 +++++ src/or/control.c | 3 +++ 2 files changed, 8 insertions(+)