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

[nickm at torproject.org]

commit 19febed9e5ab18bea5e7577f61e0fc930bbcdc68
Merge: 47c8433 8a69cc0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 14 13:39:26 2011 -0400

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

 changes/bug3349 |    9 +++++++++
 src/or/main.c   |    3 ++-
 2 files changed, 11 insertions(+), 1 deletions(-)