From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 19 Feb 2013 20:02:22 +0000 (-0500)
Subject: Merge branch 'bug8065_v2'
X-Git-Tag: tor-0.2.4.11-alpha~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ddf4e218e24167d1c595b74af62dd83b60d99a7;p=thirdparty%2Ftor.git

Merge branch 'bug8065_v2'
---

8ddf4e218e24167d1c595b74af62dd83b60d99a7