Merge branch 'master' into otrsmp

Conflicts:
	install-all.sh

src/profanity.c

@@ -31,6 +31,7 @@
 #include <string.h>
 
 #include <glib.h>
+#include <gnutls/gnutls.h>
 
 #include "profanity.h"
 #include "chat_session.h"
@@ -257,6 +258,7 @@ _init(const int disable_tls, char *log_level)
     setlocale(LC_ALL, "");
     // ignore SIGPIPE
     signal(SIGPIPE, SIG_IGN);
+    gnutls_global_init();
     _create_directories();
     log_level_t prof_log_level = log_level_from_string(log_level);
     prefs_load();
@@ -305,6 +307,7 @@ _shutdown(void)
     accounts_close();
     cmd_uninit();
     log_close();
+    gnutls_global_deinit();
 }
 
 static void