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

[nickm at torproject.org]

commit e273890b10092b0a482204920606f3d6d0fdc4b9
Merge: 734e860 0317dc2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 1 12:57:21 2011 -0400

    Merge branch 'cov217_master'

 changes/cov217_scanf         |    5 +++++
 src/common/compat_libevent.c |    4 ++--
 src/or/config.c              |    2 +-
 src/or/directory.c           |    6 +++---
 src/or/eventdns.c            |    4 ++--
 src/or/geoip.c               |    4 ++--
 src/or/policies.c            |   14 +++++++-------
 src/or/relay.c               |    8 ++++----
 src/or/routerlist.c          |    2 ++
 src/or/routerparse.c         |    8 ++++----
 src/test/test.c              |    5 ++++-
 11 files changed, 36 insertions(+), 26 deletions(-)