[tor-commits] [tor/master] Merge branch 'bug21019_030_01_squashed'

[nickm at torproject.org]

commit 5762d6489d90e0259d8dac2557e7faa045b458fc
Merge: 2e656d1 fb8dad5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 13 12:11:00 2017 -0500

    Merge branch 'bug21019_030_01_squashed'

 src/or/connection_edge.c | 32 +++++++++++++++++++++++++++++++-
 src/or/connection_edge.h |  2 +-
 2 files changed, 32 insertions(+), 2 deletions(-)