From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 11 May 2016 16:36:27 +0000 (-0400)
Subject: Merge branch 'bug18761_028_squashed' into maint-0.2.8
X-Git-Tag: tor-0.2.8.3-alpha~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28e1aa111803bc3548e00503ab56de5f3d41c7fc;p=thirdparty%2Ftor.git

Merge branch 'bug18761_028_squashed' into maint-0.2.8
---

28e1aa111803bc3548e00503ab56de5f3d41c7fc