[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'

[nickm at torproject.org]

commit 7e8d7a017e130cc7855aa508e8a37321438b6e52
Merge: 46434ec e9b33ed
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 5 05:08:54 2012 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3'

 changes/bug6296     |    4 ++++
 src/common/compat.h |    3 +++
 src/or/connection.c |    4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)