]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 67877f5 f7ed4a7)
Merge branch 'maint-0.2.6' into maint-0.2.7 maint-0.2.7
authorNick Mathewson <nickm@torproject.org>
Wed, 15 Feb 2017 12:52:41 +0000 (07:52 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 15 Feb 2017 12:52:41 +0000 (07:52 -0500)

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