[tor-commits] [arm/master] Merge branch 'torrc-override'

[atagar at torproject.org]

commit 5b4c2765384045de454f33f390886a56483a6979
Merge: ce2ff76 d1c16ba
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Aug 6 16:37:52 2011 -0700

    Merge branch 'torrc-override'

 src/cli/wizard.py                       |  100 ++++++++-
 src/resources/torrcOverride/override.c  |   50 +++++
 src/resources/torrcOverride/override.h  |    1 +
 src/resources/torrcOverride/override.py |  363 +++++++++++++++++++++++++++++++
 src/settings.cfg                        |    4 +
 5 files changed, 506 insertions(+), 12 deletions(-)