From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 20 Aug 2014 19:32:48 +0000 (-0400)
Subject: Merge branch 'bug12205_take2_squashed'
X-Git-Tag: tor-0.2.6.1-alpha~190
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=916fba2243f36dcf53b078a95ce2389a63b94f72;p=thirdparty%2Ftor.git

Merge branch 'bug12205_take2_squashed'
---

916fba2243f36dcf53b078a95ce2389a63b94f72