[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug6164' into maint-0.2.4

[nickm at torproject.org]

commit aa4fcc4f13ecc0959f26ac4c86a8e9b59d9c8783
Merge: 0b827cb 5d2b2b9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 18 15:45:49 2013 -0400

    Merge remote-tracking branch 'public/bug6164' into maint-0.2.4

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