From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 22 Jul 2015 16:24:21 +0000 (-0400)
Subject: Merge branch 'ticket2325_squashed'
X-Git-Tag: tor-0.2.7.2-alpha~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=382c27d8a9b5738356a575fc19fd0db1056293bf;p=thirdparty%2Ftor.git

Merge branch 'ticket2325_squashed'
---

382c27d8a9b5738356a575fc19fd0db1056293bf