From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 25 May 2016 14:21:15 +0000 (-0400)
Subject: Merge branch 'maint-0.2.8'
X-Git-Tag: tor-0.2.9.1-alpha~212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44ea3dc3311564a9b7f6f67a106be0fa56b38554;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.8'
---

44ea3dc3311564a9b7f6f67a106be0fa56b38554