]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'karsten/task-5824'
authorNick Mathewson <nickm@torproject.org>
Fri, 28 Feb 2014 13:32:13 +0000 (08:32 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 28 Feb 2014 13:32:13 +0000 (08:32 -0500)
1  2 
src/or/config.c
src/or/geoip.c

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