From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 18 Jul 2013 12:45:13 +0000 (-0400)
Subject: Merge branch 'bug8929_rebase_2'
X-Git-Tag: tor-0.2.5.1-alpha~105
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b551988ef46ac29427a3bd8d8a76965b190623ab;p=thirdparty%2Ftor.git

Merge branch 'bug8929_rebase_2'
---

b551988ef46ac29427a3bd8d8a76965b190623ab