]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 124062e 635c5a8)
Merge branch 'maint-0.2.4' into maint-0.2.5
authorRoger Dingledine <arma@torproject.org>
Mon, 13 Feb 2017 20:23:50 +0000 (15:23 -0500)
committerRoger Dingledine <arma@torproject.org>
Mon, 13 Feb 2017 20:23:50 +0000 (15:23 -0500)

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