Merge remote-tracking branch 'public/deprecation_v2'

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/shared_random_state.c

src/or/statefile.c

src/test/test_options.c