From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 12 Aug 2015 17:35:53 +0000 (-0400)
Subject: Merge branch 'bug16539'
X-Git-Tag: tor-0.2.7.3-rc~118
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b2696296640585bb6247ff6c88570c38b4b25a8;p=thirdparty%2Ftor.git

Merge branch 'bug16539'
---

6b2696296640585bb6247ff6c88570c38b4b25a8