]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/bug18623_028_01'
authorNick Mathewson <nickm@torproject.org>
Thu, 24 Mar 2016 19:03:50 +0000 (15:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 24 Mar 2016 19:03:50 +0000 (15:03 -0400)

Trivial merge