[tor-commits] [tor/master] Merge branch 'bug4647_squashed'

commit e35c972851686b5f6f2181e4eddb592f07fd7587 Merge: e0b2cd0 bf5e1e1 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 13 12:36:55 2013 -0400

Merge branch 'bug4647_squashed'

changes/bug4647 | 18 +++ doc/tor.1.txt | 2 +- src/or/config.c | 220 +++++++++++++++++++++++++------------ src/or/config.h | 10 +- src/or/confparse.c | 19 +++- src/or/confparse.h | 4 +- src/or/control.c | 2 +- src/or/main.c | 63 +++++++++-- src/or/or.h | 4 +- src/test/test_cmdline_args.py | 242 +++++++++++++++++++++++++++++++++++++++++ 10 files changed, 495 insertions(+), 89 deletions(-)