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

[nickm at torproject.org]

commit 0dac0d8ad68f17fa1803ebd82e402e5181e0532a
Merge: 9f1b1ef b6931b0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 19 03:06:15 2012 -0400

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

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