From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 4 Jun 2014 19:30:43 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug12169_relay_check'
X-Git-Tag: tor-0.2.5.5-alpha~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=95d47a74815ede0e4d0296f02db39dca3e0c1b39;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug12169_relay_check'
---

95d47a74815ede0e4d0296f02db39dca3e0c1b39