nsa.gov -> eff.org
state backward compatibility up front at start of 3.0
Merge branch 'master' of ssh://github.com/deian/nsdi2014