[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug13667_025_v4'

[nickm@xxxxxxxxxxxxxx]

commit e936b9b47de954fa1f34110b871edc695cbcf696
Merge: d7ecdd6 88901c3
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Dec 30 08:34:48 2014 -0500

    Merge remote-tracking branch 'dgoulet/bug13667_025_v4'

 changes/bug13667         |    5 +++++
 src/or/connection_edge.c |   15 +++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits