When powerful quantum-computers will be possible in the future they will also able to break RSA, Diffie-Hellman and elliptical curves and can even decrypt traffic recorded right in the past (i.e. now e.g.). Therefore there is a need for post-quantum cryptography.
There is still much need for scientific research in this topic, but Google has already began implementing a key exchange, which may be secure against quantum attacks. It’s name is “New Hope”.
As the key exchange may be weaker than though and may turn out to be breakable by current computers Google combines it with a X25519 key exchange, to protect users. They call this hybrid mode CECPQ1 and it is currently implemented BoringSSL and used in Chrome Canary.
BTW also Tor is discussing the use of CECPQ1.
More information:
There is also German article: http://www.golem.de/news/new-hope-google-testet-post-quanten-algorithmus-1607-121989.html