I think the Freedombox concept is the technical part of the two prong solution to the problem. EFF handles free speech and privacy. Freedombox deals with the just in case situation if/when EFF fails.