]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Wed, 1 Jun 2011 15:08:28 +0000 (11:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 1 Jun 2011 15:08:28 +0000 (11:08 -0400)
1  2 
src/or/config.c
src/or/routerparse.c

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