Merge branch 'no_gmt_unix_time' of git://github.com/nmathewson/openssl into OpenSSL_1...
authorBen Laurie <ben@links.org>
Sat, 19 Oct 2013 10:46:32 +0000 (11:46 +0100)
committerBen Laurie <ben@links.org>
Sat, 19 Oct 2013 10:46:32 +0000 (11:46 +0100)
commit62036c6fc370eb57422d3d7925070b82d2b980ac
tree484b54e31a603198f3cfc75b777121e43bf6e0a5
parent68dd8512b7cb7e71bb951efe7863dbecb34e6611
parent2583270191a8b27eed303c03ece1da97b9b69fd3
Merge branch 'no_gmt_unix_time' of git://github.com/nmathewson/openssl into OpenSSL_1_0_1-stable
ssl/d1_srvr.c
ssl/ssl.h