Merge remote-tracking branch 'origin/moonshot' into HEAD

Conflicts:
	Makefile.am

diff --cc Makefile.am
index 725f6c8,b735ec8..b3e8865
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -57,9 -57,7 +57,8 @@@ CFLAGS += -DCONFIG_IPV
  CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
  CFLAGS += -DCONFIG_CRYPTO_INTERNAL
  CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT
 +CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
  
- 
  UTILS_SRCS = src/utils/base64.c \
        src/utils/common.c \
        src/utils/ip_addr.c \