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

[nickm at torproject.org]

commit 84f27eb051e0a770b16babd3c12198e16bd8537e
Merge: f038b45 98abe14
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 15 14:50:42 2011 -0400

    Merge remote branch 'origin/maint-0.2.2'

 changes/bug2683a               |    3 +++
 changes/log-typo-2011-03-15-01 |    3 +++
 src/or/directory.c             |    2 ++
 src/or/routerparse.c           |    2 +-
 4 files changed, 9 insertions(+), 1 deletions(-)