]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c9081bd 1e553b6)
Merge remote-tracking branch 'dgoulet/bug13239_029_01'
authorNick Mathewson <nickm@torproject.org>
Mon, 2 May 2016 17:55:00 +0000 (13:55 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 2 May 2016 17:55:00 +0000 (13:55 -0400)

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