From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 19 Apr 2016 18:08:05 +0000 (-0400)
Subject: Merge branch 'handles_squashed'
X-Git-Tag: tor-0.2.9.1-alpha~284
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=520799f0846a2f32396fbbbea94a00fbe633c9d8;p=thirdparty%2Ftor.git

Merge branch 'handles_squashed'
---

520799f0846a2f32396fbbbea94a00fbe633c9d8