[tor-commits] [tor/master] Merge remote-tracking branch 'public/decouple-write'

[nickm at torproject.org]

commit 887d86b76d0c10883c1516fc19e8b796a70479cf
Merge: e86c3b2 aadff62
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 6 12:58:18 2015 -0400

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

 changes/decouple-write-handle_write |    7 +++++++
 src/or/connection.c                 |   28 ----------------------------
 2 files changed, 7 insertions(+), 28 deletions(-)