[tor-commits] [tor/maint-0.2.3] Merge branch 'bug7149' into maint-0.2.3

[nickm at torproject.org]

commit b6931b010512d3d8cbda24c87a8cf379305e1457
Merge: a0e9dc9 d3bfdd6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 19 03:02:57 2012 -0400

    Merge branch 'bug7149' into maint-0.2.3

 changes/dirserv-BUGGY-a |    7 +++++++
 src/or/directory.c      |    2 ++
 2 files changed, 9 insertions(+), 0 deletions(-)