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

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