]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'linus/enh6876_2'
authorNick Mathewson <nickm@torproject.org>
Fri, 28 Sep 2012 15:57:36 +0000 (11:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 28 Sep 2012 15:57:36 +0000 (11:57 -0400)
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