]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c3b365 0eec8e2)
Merge branch 'maint-0.2.3' into maint-0.2.4
authorRoger Dingledine <arma@torproject.org>
Sat, 20 Sep 2014 20:49:24 +0000 (16:49 -0400)
committerRoger Dingledine <arma@torproject.org>
Sat, 20 Sep 2014 20:49:24 +0000 (16:49 -0400)
1  2 
src/or/config.c patch | diff1 | diff2 | blob | history

diff --cc src/or/config.c
Simple merge
Mirror of https://git.torproject.org/tor.git