]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f5a710 f2a3041)
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
authorNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 15:38:05 +0000 (10:38 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 7 Feb 2017 15:38:05 +0000 (10:38 -0500)
1  2 
src/or/main.c patch | diff1 | diff2 | blob | history

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