]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug16980'
authorNick Mathewson <nickm@torproject.org>
Tue, 8 Sep 2015 14:41:51 +0000 (10:41 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 8 Sep 2015 14:41:51 +0000 (10:41 -0400)

Trivial merge