From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 14 Jan 2013 02:43:53 +0000 (-0500)
Subject: Merge branch 'bug7935'
X-Git-Tag: tor-0.2.4.8-alpha~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dab25eb37dd7d5245a03a5380ba5f80c64e4ac3d;p=thirdparty%2Ftor.git

Merge branch 'bug7935'
---

dab25eb37dd7d5245a03a5380ba5f80c64e4ac3d