]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b8526d c7c73f1 3cc6d59)
Merge remote-tracking branches 'public/decouple_lost_owner' and 'public/decouple_signals'
authorNick Mathewson <nickm@torproject.org>
Mon, 17 Aug 2015 20:24:45 +0000 (16:24 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 17 Aug 2015 20:24:45 +0000 (16:24 -0400)
1  2  3 
src/or/main.c patch | diff1 | diff2 | diff3 | blob | history
src/or/main.h patch | diff1 | diff2 | diff3 | blob | history

diff --cc src/or/main.c
Simple merge
diff --cc src/or/main.h
Simple merge
Mirror of https://git.torproject.org/tor.git