commit ed2a4304b88c0901b68c29c0fdfceaff3b0c1f3c Merge: e7231f3 b698fa4 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jan 19 16:36:22 2018 -0500 Merge branch 'disable_signal_handlers_squashed' control-spec.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)