]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug1789'
authorNick Mathewson <nickm@torproject.org>
Tue, 21 Sep 2010 18:29:59 +0000 (14:29 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 21 Sep 2010 18:29:59 +0000 (14:29 -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