]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'postloop_callbacks_2'
authorNick Mathewson <nickm@torproject.org>
Fri, 13 Apr 2018 16:12:46 +0000 (12:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 13 Apr 2018 16:12:46 +0000 (12:12 -0400)
1  2 
src/or/main.c
src/or/main.h

diff --cc src/or/main.c
Simple merge
diff --cc src/or/main.h
Simple merge