murgatroid99 98cdf3b3e6 Merge remote-tracking branch 'upstream/v1.1.x' into merge_1.1.x_master 9 vuotta sitten
..
client_ssl.c 98cdf3b3e6 Merge remote-tracking branch 'upstream/v1.1.x' into merge_1.1.x_master 9 vuotta sitten
server_ssl.c ca7effcdff Replace timeout/scaling macros with functions. 9 vuotta sitten