]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a40d212 f3c040e)
Merge remote-tracking branch 'dgoulet/bug20938_029_01' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Mon, 12 Dec 2016 01:40:01 +0000 (20:40 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 12 Dec 2016 01:40:01 +0000 (20:40 -0500)

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