]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 702c1dc b0f1241)
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Mon, 17 Oct 2016 20:32:31 +0000 (16:32 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 17 Oct 2016 20:32:31 +0000 (16:32 -0400)
"ours" commit to avoid bumping version.


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