From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 Aug 2015 16:58:18 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/decouple-write'
X-Git-Tag: tor-0.2.7.3-rc~129
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=887d86b76d0c10883c1516fc19e8b796a70479cf;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/decouple-write'
---

887d86b76d0c10883c1516fc19e8b796a70479cf