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

[nickm at torproject.org]

commit 582f2187a769ea723f6bf13bc91f7a4b3c861408
Merge: a73dec1 1e68c21
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 13 10:08:51 2012 -0400

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

 changes/bug6827      |    9 +++++++++
 src/or/or.h          |    7 +++++--
 src/or/routerparse.c |    3 +++
 3 files changed, 17 insertions(+), 2 deletions(-)