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

commit 05ac3d0458466bd8ffc69339a4bf8e34088d9d80 Merge: 751595551 3b465ebf2 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 11 12:45:25 2018 -0500

Merge branch 'restart_nocrash'

changes/bug24581 | 7 +++++++ src/common/compat_libevent.c | 10 ++++++++++ src/common/compat_libevent.h | 1 + src/common/crypto.c | 2 ++ src/or/config.c | 4 +++- src/or/main.c | 1 + src/or/tor_api.h | 5 +++-- 7 files changed, 27 insertions(+), 3 deletions(-)