]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d3883d 528dcd1)
Merge branch 'maint-0.3.0'
authorNick Mathewson <nickm@torproject.org>
Wed, 1 Mar 2017 20:39:01 +0000 (15:39 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 1 Mar 2017 20:39:01 +0000 (15:39 -0500)
"ours" to avoid version bump


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