]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c6d4fe 26f68df)
Merge branch 'maint-0.2.8' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Thu, 14 Sep 2017 17:21:28 +0000 (13:21 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 14 Sep 2017 17:21:28 +0000 (13:21 -0400)
"ours" merge to avoid version bump.


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