From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 29 Dec 2012 06:23:14 +0000 (-0500)
Subject: Merge branch 'bug7814_squash'
X-Git-Tag: tor-0.2.4.8-alpha~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51c2dd8f8954d52fbaef29d2afb44d5eda47f4da;p=thirdparty%2Ftor.git

Merge branch 'bug7814_squash'
---

51c2dd8f8954d52fbaef29d2afb44d5eda47f4da