]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4bb886 9d3de77)
Merge branch 'maint-0.2.5' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 16:21:25 +0000 (12:21 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 16:21:25 +0000 (12:21 -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