]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug12169_relay_check'
authorNick Mathewson <nickm@torproject.org>
Wed, 4 Jun 2014 19:30:43 +0000 (15:30 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 4 Jun 2014 19:30:43 +0000 (15:30 -0400)

Trivial merge