From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 24 May 2013 17:39:37 +0000 (-0400)
Subject: Merge branch 'bug4282_rebased'
X-Git-Tag: tor-0.2.5.1-alpha~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5269f2b22e6c93a8a5171c2575b53d6aa88c3ccb;p=thirdparty%2Ftor.git

Merge branch 'bug4282_rebased'
---

5269f2b22e6c93a8a5171c2575b53d6aa88c3ccb