Merge remote-tracking branches 'public/decouple_lost_owner' and 'public/decouple_signals'
commitd07fe5dffe8299f51cc2b7df06c1dd28dd9a6f0d
authorNick Mathewson <nickm@torproject.org>
Mon, 17 Aug 2015 20:24:45 +0000 (17 16:24 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 17 Aug 2015 20:24:45 +0000 (17 16:24 -0400)
tree325213a31809ab48d0b1be8cb76b2d3d955fe8d2
parent7b8526d64c64f71b4d9a58dc3c48cd694b91079e
parentc7c73f117827b40c4086203f2bead9b45c0539e8
parent3cc6d59521b14403f9a0689b2f78f7638d403827
Merge remote-tracking branches 'public/decouple_lost_owner' and 'public/decouple_signals'
src/or/main.c
src/or/main.h