]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cdaf9ae da29074)
Merge branch 'maint-0.2.9' into maint-0.3.2
authorNick Mathewson <nickm@torproject.org>
Fri, 7 Sep 2018 19:11:49 +0000 (15:11 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 7 Sep 2018 19:11:49 +0000 (15:11 -0400)
"ours" to avoid bump


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