]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug10758'
authorNick Mathewson <nickm@torproject.org>
Mon, 3 Feb 2014 16:05:29 +0000 (11:05 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 3 Feb 2014 16:05:29 +0000 (11:05 -0500)
1  2 
src/or/config.c
src/or/or.h

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