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

[nickm at torproject.org]

commit 8839b86085dbb9ccf26165b6eae4d09462bc88b6
Merge: 910dadd 54d7d31
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 14 12:25:33 2011 -0400

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

 changes/coverity_maint |    9 +++++++++
 src/common/util.c      |   33 ++++++++++++++++++++++++++-------
 src/common/util.h      |    3 ++-
 src/or/circuitlist.c   |    4 ++--
 src/or/config.c        |    6 ++++--
 src/or/connection.c    |    2 +-
 src/or/geoip.c         |    6 +++---
 src/or/policies.c      |    2 +-
 src/or/rendservice.c   |    2 +-
 src/or/rephist.c       |   13 +++++++------
 src/or/router.c        |    4 ++--
 src/or/routerparse.c   |    6 +++---
 src/test/test_addr.c   |    3 +++
 13 files changed, 64 insertions(+), 29 deletions(-)