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

[nickm at torproject.org]

commit 938cb6a55e05751a30e50f744bc568b27812a344
Merge: c134bb5 ae15b55
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 15 16:30:26 2013 -0500

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

 changes/bug7889  |    8 ++++++++
 src/or/command.c |    8 ++++++++
 src/or/relay.c   |   17 +++++++++++++++++
 3 files changed, 33 insertions(+), 0 deletions(-)