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

[nickm at torproject.org]

commit d404b0200ff72a45d7c505a12f0ee98f89d28176
Merge: e5b79b5 aa4fcc4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 18 15:46:01 2013 -0400

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

 src/or/dirserv.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)