Merge remote-tracking branch 'agl/1.0.2alpn' into agl-alpn
authorBen Laurie <ben@links.org>
Tue, 1 Oct 2013 11:20:02 +0000 (12:20 +0100)
committerBen Laurie <ben@links.org>
Tue, 1 Oct 2013 11:20:02 +0000 (12:20 +0100)
commit63fe3221601d55ab340b89d15c17cb90d168487f
tree636885950b6295d19c64a5e496b932ebee0d902e
parentc808798013ef7dc0aaafd030929976ddba8668db
parent8ae78c6bd90d19bfcc4b5854f1b9285d6fdcfa70
Merge remote-tracking branch 'agl/1.0.2alpn' into agl-alpn

Conflicts:
ssl/ssl3.h
ssl/t1_lib.c
apps/s_client.c
apps/s_server.c
ssl/s3_lib.c
ssl/ssl.h
ssl/ssl3.h
ssl/ssl_lib.c
ssl/t1_lib.c