]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97f7efa 484710f)
Merge branch 'maint-0.2.9' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Tue, 17 Sep 2019 22:57:49 +0000 (18:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 17 Sep 2019 22:57:49 +0000 (18:57 -0400)
"ours" merge to avoid picking up 0.2.9 version of ticket 31673.


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