Re-add alert variables removed during rebase
authorScott Deboy <sdeboy@secondstryke.com>
Tue, 4 Feb 2014 21:08:43 +0000 (13:08 -0800)
committerScott Deboy <sdeboy@secondstryke.com>
Sun, 9 Feb 2014 00:19:01 +0000 (16:19 -0800)
commit7612511b3b54e5d729caa9897a1cfb5beb224266
treec6d09d8a19b67c47918085fc9b5cc0778d5a26cd
parent19a28a8aa3df6680545bcc4496110aed4a112bc5
Re-add alert variables removed during rebase
Whitespace fixes

(cherry picked from commit e9add063b50e8a460d5636055156d2760c2fe29f)
Conflicts:
ssl/s3_clnt.c
apps/s_client.c
apps/s_server.c
ssl/s23_clnt.c
ssl/s3_clnt.c
ssl/s3_lib.c
ssl/s3_srvr.c
ssl/ssl.h
ssl/ssl_rsa.c
ssl/ssltest.c
ssl/t1_lib.c