]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8bd3c1b e1337b4)
Merge remote-tracking branch 'dgoulet/ticket21269_030_01'
authorNick Mathewson <nickm@torproject.org>
Fri, 27 Jan 2017 16:26:23 +0000 (11:26 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 27 Jan 2017 16:26:23 +0000 (11:26 -0500)

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