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

[nickm at torproject.org]

commit 875a54dad3c4674cc1567d3154e0ccb191dfc0f0
Merge: 2bd40a8 2cddd1d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 16 15:10:38 2012 -0500

    Merge remote-tracking branch 'public/bug3325'

 changes/bug3325          |    3 +++
 src/or/connection_edge.c |   10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)