]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f602172 53d4e89)
Merge branch 'bug19960_2' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Thu, 8 Dec 2016 12:48:14 +0000 (07:48 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 8 Dec 2016 12:48:14 +0000 (07:48 -0500)

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