commit ae15b55173abff1175e0f56759abd29e2870b16c Merge: 1625cdd 4ccf09b Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 15 16:30:07 2013 -0500

Merge branch 'bug7889_023' into maint-0.2.3

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