]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5d738e c82881a)
Merge remote-tracking branch 'dgoulet/bug20629_030_01'
authorNick Mathewson <nickm@torproject.org>
Fri, 18 Nov 2016 01:12:13 +0000 (20:12 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 18 Nov 2016 01:12:13 +0000 (20:12 -0500)

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