FWIW, my personal belief is that when the dust settles in another decade there will only be a metaphorical oligopoly of distributed systems, each of which having generalized in their purposes in order to have "shared security" across a number of different use cases. Regardless, I maintain that Tor doesn't protect against the NSA today (and for even more reasons than come from this article today: the NSA can do attacks that don't even require running nodes, involving stuff like timing analysis attacks that Tor does nothing to prevent), so focusing on the NSA seems like a pointless exercise.
