From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 13 Jun 2012 14:13:01 +0000 (-0400)
Subject: Merge branch 'task-5849-3-squashed'
X-Git-Tag: tor-0.2.3.17-beta~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=971cf123743693677ab1b480692d117e333cb882;p=thirdparty%2Ftor.git

Merge branch 'task-5849-3-squashed'
---

971cf123743693677ab1b480692d117e333cb882