From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 4 May 2016 19:12:11 +0000 (-0400)
Subject: Merge branch 'bug18686_025' into maint-0.2.8
X-Git-Tag: tor-0.2.8.3-alpha~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8e8910d60e41844ce4ab37d9306cb8e8b5aec91;p=thirdparty%2Ftor.git

Merge branch 'bug18686_025' into maint-0.2.8
---

b8e8910d60e41844ce4ab37d9306cb8e8b5aec91