Merge branch 'bug4647_squashed'

changes/bug4647

doc/tor.1.txt

src/or/config.c

src/or/config.h

src/or/confparse.c

src/or/confparse.h

src/or/control.c

src/or/main.c

src/or/or.h

src/test/test_cmdline_args.py