From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 29 Mar 2013 16:17:35 +0000 (-0400)
Subject: Merge branch 'bug7799_rebased' into maint-0.2.4
X-Git-Tag: tor-0.2.5.1-alpha~232^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33f86faa5a20c3c2b7c6be386186bb01b5883739;p=thirdparty%2Ftor.git

Merge branch 'bug7799_rebased' into maint-0.2.4
---

33f86faa5a20c3c2b7c6be386186bb01b5883739