]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3804f5 ec3ce77)
Merge branch 'maint-0.2.4' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Thu, 8 Jun 2017 18:05:37 +0000 (14:05 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 8 Jun 2017 18:05:37 +0000 (14:05 -0400)
"ours" merge to avoid version bump.


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