[tor-commits] [tor/master] Merge remote-tracking branches 'public/decouple_lost_owner' and 'public/decouple_signals'

[nickm at torproject.org]

commit d07fe5dffe8299f51cc2b7df06c1dd28dd9a6f0d
Merge: 7b8526d c7c73f1 3cc6d59
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 17 16:24:45 2015 -0400

    Merge remote-tracking branches 'public/decouple_lost_owner' and 'public/decouple_signals'

 changes/decouple_lost_owner |    4 ++
 src/or/control.c            |   13 +-----
 src/or/main.c               |  107 +++++++++++++++++++++++++++++++------------
 src/or/main.h               |    2 +-
 4 files changed, 84 insertions(+), 42 deletions(-)