From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 12 Sep 2012 20:28:59 +0000 (-0400)
Subject: Merge branch 'bug6815'
X-Git-Tag: tor-0.2.4.3-alpha~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a73dec16c539fd957ab09f242cd44b0a0858cd38;p=thirdparty%2Ftor.git

Merge branch 'bug6815'
---

a73dec16c539fd957ab09f242cd44b0a0858cd38