]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug8716_023' into maint-0.2.4
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Apr 2013 01:33:53 +0000 (21:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Apr 2013 01:33:53 +0000 (21:33 -0400)
1  2 
src/or/config.c
src/or/control.c
src/or/control.h

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