[tor-commits] [tor/master] Merge branch 'restart_debug_squashed'

[nickm at torproject.org]

commit 2c9e0a286cad3c0bbc1797f75a8c516df476db62
Merge: e7907f15f 97d9ba238
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 19 09:52:14 2018 -0500

    Merge branch 'restart_debug_squashed'

 changes/feature24583 |  9 +++++++++
 configure.ac         |  6 ++++++
 src/or/main.c        | 39 +++++++++++++++++++++++++++++++++++++++
 src/or/tor_main.c    | 16 +++++++++++++++-
 4 files changed, 69 insertions(+), 1 deletion(-)