]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43c18b1 144ec3d)
Merge branch 'maint-0.2.5' into maint-0.2.6
authorRoger Dingledine <arma@torproject.org>
Mon, 13 Feb 2017 20:27:57 +0000 (15:27 -0500)
committerRoger Dingledine <arma@torproject.org>
Mon, 13 Feb 2017 20:27:57 +0000 (15:27 -0500)

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