[tor-commits] [tor/master] Merge branch 'maint-0.2.4' into master

[andrea at torproject.org]

commit 9c58905a2bfd1049613173c27c357e8a20ff066a
Merge: ef83db4 a1d7f7e
Author: Andrea Shepard <andrea at torproject.org>
Date:   Tue May 7 02:24:08 2013 -0700

    Merge branch 'maint-0.2.4' into master

 changes/bug8833  |    3 +++
 src/or/dirserv.c |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)