From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Mar 2014 18:08:29 +0000 (-0400)
Subject: Merge branch 'bug11043_take2_squashed'
X-Git-Tag: tor-0.2.5.3-alpha~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c04416c11d79e8dc5fc9def6ea337f75526e397;p=thirdparty%2Ftor.git

Merge branch 'bug11043_take2_squashed'
---

0c04416c11d79e8dc5fc9def6ea337f75526e397