]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 887d86b 79798a2)
Merge remote-tracking branch 'dgoulet/bug16274_027_02'
authorNick Mathewson <nickm@torproject.org>
Mon, 10 Aug 2015 15:49:04 +0000 (11:49 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 10 Aug 2015 15:49:04 +0000 (11:49 -0400)

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