NEWS: caution about secret introducer.furl in world-readable tahoe.cfg
Merge branch 'master' into preferred_peers
fix tests
Merge branch 'preferred_peers' into truckee
make tests pass with redesigned directory pages
Merge branch 'redesigned-directory-page' into truckee