# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1474926323 -10800
# Node ID f8eb47b52a75aedf2c9d5295881638beae932af8
# Parent  77ae15ffc3cc32a16f83b145fd7cd13c017311b7# Parent  f8ea8e833f48fc2e1874c2cfab23050c1c8408ce
Merged.

diff -r 77ae15ffc3cc -r f8eb47b52a75 COPYING
--- a/COPYING	Tue Sep 27 00:44:34 2016 +0300
+++ b/COPYING	Tue Sep 27 00:45:23 2016 +0300
@@ -1,5 +1,5 @@
 th-libs - Simple helper functions library in ISO C99
-Programmed and designed by Matti 'ccr' Hämäläinen
+Programmed and designed by Matti 'ccr' Hämäläinen <ccr@tnsp.org>
 (C) Copyright 2002-2016 Tecnic Software productions (TNSP)
 
 
diff -r 77ae15ffc3cc -r f8eb47b52a75 th_network.c
--- a/th_network.c	Tue Sep 27 00:44:34 2016 +0300
+++ b/th_network.c	Tue Sep 27 00:45:23 2016 +0300
@@ -316,7 +316,7 @@
         default:
             err = THERR_INIT_FAIL;
             th_conn_err(conn, err,
-                "Invalid proxy settings for SOCKS 4, unsupported address type requrested.\n");
+                "Invalid proxy settings for SOCKS 4, unsupported address type requested.\n");
             goto out;
     }