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

[nickm]

commit 60fa447afa22ac09d3b0ba44a7af343d9a42a5fa
Merge: 3ae4df5 9d13346
Author: Nick Mathewson <ni...@torproject.org>
Date:   Sat Jan 15 13:11:10 2011 -0500

    Merge remote branch 'origin/maint-0.2.2'

 src/or/dnsserv.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)