]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d949589 e1a59ad)
Merge remote-tracking branch 'dgoulet/ticket21980_031_01'
authorNick Mathewson <nickm@torproject.org>
Mon, 24 Apr 2017 16:42:11 +0000 (12:42 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 24 Apr 2017 16:42:11 +0000 (12:42 -0400)

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