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

[nickm at torproject.org]

commit c2d3da6303a6a5e41eabcb18b56ee5d8434a9817
Merge: 2163e42 3e3aac5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 19 12:59:10 2011 -0400

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

 changes/bug3607         |   15 +++++++++++++++
 src/or/geoip.c          |    4 ++--
 src/or/rendservice.c    |    6 ++++--
 src/or/rephist.c        |    2 +-
 src/tools/tor-gencert.c |    4 ++--
 5 files changed, 24 insertions(+), 7 deletions(-)