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

[nickm at torproject.org]

commit c19a2ff6913111d69f2b541194ae188dc354fc54
Merge: 20d6f78 2b6e91c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 5 10:16:28 2012 -0400

    Merge remote-tracking branch 'public/bug4710'

 changes/bug4710  |    5 +++++
 src/or/reasons.c |    2 ++
 2 files changed, 7 insertions(+), 0 deletions(-)