]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4cca7fb dd6c2b0)
Merge branch 'maint-0.2.9' into maint-0.3.3
authorNick Mathewson <nickm@torproject.org>
Wed, 23 Jan 2019 14:50:38 +0000 (09:50 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 23 Jan 2019 14:50:38 +0000 (09:50 -0500)
"ours" merge to avoid dropping non-broken changes files after
removal of merged 0.2.9 changes files.


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