]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b18bde2 39ef343)
Merge branch 'maint-0.2.5' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Tue, 20 Dec 2016 23:22:27 +0000 (18:22 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 20 Dec 2016 23:22:27 +0000 (18:22 -0500)
("ours" merge because there is a separate 20384 patch for 026)


Trivial merge
Mirror of https://git.torproject.org/tor.git