]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a57f1ff 0a72d1c)
Merge branch 'maint-0.2.8' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Mon, 18 Sep 2017 18:40:22 +0000 (14:40 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 18 Sep 2017 18:40:22 +0000 (14:40 -0400)
"ours" to avoid version bump.


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