From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 11 Jun 2012 14:14:01 +0000 (-0400)
Subject: Merge branch 'bug6097'
X-Git-Tag: tor-0.2.3.17-beta~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6180b7f290c52b03f8abe3caf2ce233399dd66f;p=thirdparty%2Ftor.git

Merge branch 'bug6097'
---

a6180b7f290c52b03f8abe3caf2ce233399dd66f