]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'valentecaio/t-25081'
authorNick Mathewson <nickm@torproject.org>
Fri, 16 Feb 2018 01:23:23 +0000 (20:23 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 16 Feb 2018 01:23:23 +0000 (20:23 -0500)
1  2 
src/or/dirserv.c
src/or/main.c

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