| commit | c9089fa21c59d9797398e660e4943b9423db1296 | [log] [tgz] |
|---|---|---|
| author | wtc <wtc@chromium.org> | Thu Oct 02 02:41:37 2014 |
| committer | Commit bot <commit-bot@chromium.org> | Thu Oct 02 02:41:53 2014 |
| tree | 3fdb71c1b755c30f40932f78d6de51235acf2db8 | |
| parent | f09a66bb347776e5e2b5181e5f8550b7d31c0fe6 [diff] |
Merge the server-side support of ALPN from the NSS upstream. NSS upstream patches: https://hg.mozilla.org/projects/nss/rev/2cb5c73ac307 https://hg.mozilla.org/projects/nss/rev/544eb0f50d40 R=agl@chromium.org BUG=416841 Review URL: https://codereview.chromium.org/595823003 Cr-Commit-Position: refs/heads/master@{#297772}