[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/compile_warning'

[nickm at torproject.org]

commit 8157dcbdf87271feab1b610df4eb0c616b250197
Merge: 2b660f9 2d0b56a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 15 17:54:49 2011 -0400

    Merge remote-tracking branch 'sebastian/compile_warning'

 src/or/connection_or.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)