]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2c8814 f80a43d)
Merge branch 'bug20638_029_v2_squashed' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Thu, 1 Dec 2016 14:45:14 +0000 (09:45 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 1 Dec 2016 14:45:14 +0000 (09:45 -0500)

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