]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d9f8ff db58d4d)
Merge branch 'maint-0.2.5' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Tue, 20 Dec 2016 23:11:25 +0000 (18:11 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 20 Dec 2016 23:11:25 +0000 (18:11 -0500)
1  2 
src/or/rendcommon.c patch | diff1 | diff2 | blob | history
src/or/routerparse.c patch | diff1 | diff2 | blob | history

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