[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug7592_take2'

[nickm at torproject.org]

commit bd93ff8dd76b06ca3afe1f362b086d4f12639f71
Merge: e899d49 c01dfd5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 4 21:47:45 2012 -0500

    Merge remote-tracking branch 'asn/bug7592_take2'

 src/or/connection_edge.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)