]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.5'
authorRoger Dingledine <arma@torproject.org>
Thu, 24 Jul 2014 20:30:50 +0000 (16:30 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 24 Jul 2014 20:30:50 +0000 (16:30 -0400)
1  2 
src/or/config.c
src/or/dirserv.c

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