]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de65647 b838e1f)
Merge branch 'maint-0.2.8' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Mon, 19 Dec 2016 13:07:56 +0000 (08:07 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 Dec 2016 13:07:56 +0000 (08:07 -0500)
"ours" merge to avoid version bump.


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