[tor-commits] [tor/master] Merge branch 'bug2797'

[nickm at torproject.org]

commit 3799ce7970a5d1fe21ce2921c763f06e4369cfee
Merge: 7dcd105 64c8e8e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 11 09:48:38 2011 -0400

    Merge branch 'bug2797'

 src/or/circuitbuild.c    |    6 ++----
 src/or/connection_edge.c |    3 +--
 src/or/directory.c       |    2 +-
 src/or/rendclient.c      |    2 +-
 src/or/rendservice.c     |    2 +-
 src/or/routerlist.c      |    7 ++++---
 6 files changed, 10 insertions(+), 12 deletions(-)