]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44c8cb9 eb92d11)
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
authorNick Mathewson <nickm@torproject.org>
Thu, 8 Jun 2017 18:06:06 +0000 (14:06 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 8 Jun 2017 18:06:06 +0000 (14:06 -0400)
"ours" merge to avoid version bump.


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