From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 25 Jun 2015 15:30:52 +0000 (-0400)
Subject: Merge branch 'bug16288_027_03_squashed'
X-Git-Tag: tor-0.2.7.2-alpha~72
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3149bfc254025485496cb6959d4efb5331612cec;p=thirdparty%2Ftor.git

Merge branch 'bug16288_027_03_squashed'
---

3149bfc254025485496cb6959d4efb5331612cec