]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'karsten/task-11070'
authorNick Mathewson <nickm@torproject.org>
Sun, 23 Mar 2014 04:18:48 +0000 (00:18 -0400)
committerNick Mathewson <nickm@torproject.org>
Sun, 23 Mar 2014 04:18:48 +0000 (00:18 -0400)
1  2 
src/or/config.c
src/or/dirserv.c

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