From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 14 Sep 2012 13:54:08 +0000 (-0400)
Subject: Merge branch 'bug6831_v2'
X-Git-Tag: tor-0.2.4.3-alpha~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6492a75b9f23ff4d22aa4b4ffa2fe4a4f7193bad;p=thirdparty%2Ftor.git

Merge branch 'bug6831_v2'
---

6492a75b9f23ff4d22aa4b4ffa2fe4a4f7193bad