[tor-commits] [tor/master] Merge remote-tracking branch 'rransom-tor/bug4605'

[nickm at torproject.org]

commit fdc0aa8c458f13c3a5ad65e680326119c1e26ac1
Merge: 8bb23c7 e706108
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 29 20:28:08 2011 -0500

    Merge remote-tracking branch 'rransom-tor/bug4605'

 src/or/config.c  |    2 +-
 src/or/control.c |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)