Use existing variable.
Add warning to tahoe.cfg file.
Merge branch 'master' into general-improvements