aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-08-17 16:24:45 -0400
committerNick Mathewson <nickm@torproject.org>2015-08-17 16:24:45 -0400
commitd07fe5dffe8299f51cc2b7df06c1dd28dd9a6f0d (patch)
tree325213a31809ab48d0b1be8cb76b2d3d955fe8d2 /src/or/main.c
parent7b8526d64c64f71b4d9a58dc3c48cd694b91079e (diff)
parentc7c73f117827b40c4086203f2bead9b45c0539e8 (diff)
parent3cc6d59521b14403f9a0689b2f78f7638d403827 (diff)
downloadtor-d07fe5dffe8299f51cc2b7df06c1dd28dd9a6f0d.tar.gz
tor-d07fe5dffe8299f51cc2b7df06c1dd28dd9a6f0d.zip
Merge remote-tracking branches 'public/decouple_lost_owner' and 'public/decouple_signals'