| commit | f81948e9a402db94287a43bb34a07ee0daf56cb5 | [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 | 93fb0a4936aa61b7bb20f19ddc3d0904590b3876 | |
| parent | 74ae4b1f792f7510dc39345968c6909bb3a8f29b [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-Original-Commit-Position: refs/heads/master@{#297772} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: c9089fa21c59d9797398e660e4943b9423db1296