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

[nickm at torproject.org]

commit 075d904d3935bdc5c608c1e17be835e600d6990c
Merge: 5230cc4 4c789ec
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 26 11:05:54 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    Conflicts:
    	src/or/dirserv.h

 changes/bug2979 |    9 +++++++++
 src/or/config.c |   55 -------------------------------------------------------
 2 files changed, 9 insertions(+), 55 deletions(-)