From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 9 Sep 2014 15:51:18 +0000 (-0400)
Subject: Merge branch 'bug12899_squashed'
X-Git-Tag: tor-0.2.6.1-alpha~145
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59f3cce0dcddb98301d18d0cb4cb08c1619fa34c;p=thirdparty%2Ftor.git

Merge branch 'bug12899_squashed'
---

59f3cce0dcddb98301d18d0cb4cb08c1619fa34c