]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57b1cc1 d7ad6d9)
Merge branch 'maint-0.3.4'
authorNick Mathewson <nickm@torproject.org>
Mon, 9 Jul 2018 19:17:59 +0000 (15:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 Jul 2018 19:17:59 +0000 (15:17 -0400)
"ours" to avoid a pair of version bumps.


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