Merge commit 'origin/silc.1.1.branch'

Merge commit 'origin/silc.1.1.branch'

Conflicts:

	CHANGES
	TODO
	apps/Makefile.ad
	apps/autodist/CHANGES
	apps/autodist/autodist.in
	apps/autodist/doc/autodist.1.in
	apps/autodist/doc/autodist.texi
	apps/silcd/command.c
	apps/silcd/server.c
	apps/silcd/server_backup.c
	apps/silcd/server_query.c
	configure.ad
	distdir/autodist
	distdir/pre-dist-client
	distdir/pre-dist-toolkit
	includes/silc.h.in
	includes/silcversion.h.in
	lib/Makefile.ad
	lib/configure.ad
	lib/contrib/Makefile.ad
	lib/silcasn1/silcasn1.c
	lib/silcasn1/silcasn1_decode.c
	lib/silcasn1/silcasn1_encode.c
	lib/silcclient/client.h
	lib/silcclient/client_entry.c
	lib/silcclient/silcclient.h
	lib/silccore/silcpacket.c
	lib/silccrypt/Makefile.ad
	lib/silccrypt/aes.c
	lib/silccrypt/aes_x86.asm
	lib/silccrypt/aes_x86_64.asm
	lib/silccrypt/ciphers.h
	lib/silccrypt/configure.ad
	lib/silccrypt/rijndael_internal.h
	lib/silccrypt/silccipher.c
	lib/silccrypt/silcpk.c
	lib/silccrypt/silcpkcs.c
	lib/silccrypt/silcpkcs1.c
	lib/silcmath/configure.ad
	lib/silcsim/Makefile.ad
	lib/silcske/silcconnauth.c
	lib/silcske/silcske.c
	lib/silcskr/silcskr.c
	lib/silcutil/silcatomic.h
	lib/silcutil/silcbuffer.h
	lib/silcutil/silcbuffmt.c
	lib/silcutil/silcconfig.c
	lib/silcutil/silcdlist.h
	lib/silcutil/silcfdstream.c
	lib/silcutil/silcfsm.c
	lib/silcutil/silclist.h
	lib/silcutil/silclog.c
	lib/silcutil/silcmime.c
	lib/silcutil/silcmutex.h
	lib/silcutil/silcnet.h
	lib/silcutil/silcschedule.c
	lib/silcutil/silcschedule.h
	lib/silcutil/silcschedule_i.h
	lib/silcutil/silcsocketstream.c
	lib/silcutil/silcsocketstream_i.h
	lib/silcutil/silcstack.c
	lib/silcutil/silcstack.h
	lib/silcutil/silcstringprep.c
	lib/silcutil/silctime.c
	lib/silcutil/silctypes.h
	lib/silcutil/silcutil.c
	lib/silcutil/stacktrace.c
	lib/silcutil/tests/test_silcschedule.c
	lib/silcutil/tests/test_silctime.c
	lib/silcutil/unix/silcunixnet.c
	lib/silcutil/unix/silcunixschedule.c
	lib/silcutil/unix/silcunixsocketstream.c
	lib/silcutil/unix/silcunixthread.c
	lib/silcutil/win32/silcwin32schedule.c
	win32/libsilc/libsilc.def