From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 1 Mar 2013 14:33:15 +0000 (-0500)
Subject: Merge branch 'bug8367_v2'
X-Git-Tag: tor-0.2.5.1-alpha~292
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dc4ccfdbe22a48cea888179c8a1c6c671885b022;p=thirdparty%2Ftor.git

Merge branch 'bug8367_v2'
---

dc4ccfdbe22a48cea888179c8a1c6c671885b022