]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'origin/maint-0.2.3'
authorNick Mathewson <nickm@torproject.org>
Fri, 17 Aug 2012 16:39:31 +0000 (12:39 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 17 Aug 2012 16:39:31 +0000 (12:39 -0400)
1  2 
src/or/config.c
src/or/control.c

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