Merge of r85:88 from branch polarssl into trunk.
authorfatbob313 <martin@fatbob.nu>
Sat, 13 Feb 2010 22:36:54 +0000 (22:36 +0000)
committerfatbob313 <martin@fatbob.nu>
Sat, 13 Feb 2010 22:36:54 +0000 (22:36 +0000)
commit14a67bc74c81651015bbbad075f7eb1c41218cf7
tree67c78c4e4a5539144e93133e2e42f16432b07840
parent939572d614e63e0a35734935fbd8b0fbf9ebab4e
Merge of r85:88 from branch polarssl into trunk.
12 files changed:
src/Makefile
src/channel.c
src/client.c
src/client.h
src/crypt.c
src/crypt.h
src/main.c
src/messagehandler.c
src/server.c
src/ssl.c
src/ssl.h
src/voicetarget.c