Merge branch 'tor-usage-documentation' of https://github.com/david415/tahoe-lafs into tor-usage-documentation

Conflicts:
	docs/tor.rst