]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48afec9 a3342b3)
Merge branch 'maint-0.4.1'
authorNick Mathewson <nickm@torproject.org>
Tue, 17 Sep 2019 23:12:08 +0000 (19:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 17 Sep 2019 23:12:08 +0000 (19:12 -0400)
"ours" to avoid version bump.


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