]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db58d4d 8f857c2)
Merge branch 'maint-0.2.4' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Tue, 20 Dec 2016 23:19:41 +0000 (18:19 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 20 Dec 2016 23:19:41 +0000 (18:19 -0500)
(ours merge -- there is a separate 0.2.5 patch for 20384.)


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