From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 29 Sep 2014 13:05:18 +0000 (-0400)
Subject: Merge branch 'ticket961_squashed'
X-Git-Tag: tor-0.2.6.1-alpha~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e8cc766e6a4d297c66ff1afd6a5f8024607ef9c;p=thirdparty%2Ftor.git

Merge branch 'ticket961_squashed'
---

5e8cc766e6a4d297c66ff1afd6a5f8024607ef9c