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

Merge branch 'bug7869'
---

c9242f4fd4c0ae783946db77b9ecc6214d41bd72