]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'linus/bug4875_2'
authorNick Mathewson <nickm@torproject.org>
Thu, 29 Mar 2012 14:53:09 +0000 (10:53 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 29 Mar 2012 14:53:09 +0000 (10:53 -0400)
1  2 
src/or/config.c
src/or/router.c

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