aboutsummaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-10-06 07:33:45 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-10-06 07:33:45 +0000
commit367ed084db5159d822dce53a1e041a5f4e8c1ad3 (patch)
tree751d00bfa376418939774bbf6e31936eaef36e96 /COPYING
parentManagement interface can now listen on a unix (diff)
downloadopenvpn-367ed084db5159d822dce53a1e041a5f4e8c1ad3.tar.xz
Copyright notice changed to reflect change in name of
Telethra to OpenVPN Technologies. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3409 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING10
1 files changed, 5 insertions, 5 deletions
diff --git a/COPYING b/COPYING
index 5e49716..7be27ca 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
OpenVPN (TM) -- An Open Source VPN daemon
-Copyright (C) 2002-2008 Telethra, Inc. <sales@openvpn.net>
+Copyright (C) 2002-2008 OpenVPN Technologies, Inc. <sales@openvpn.net>
This distribution contains multiple components, some
of which fall under different licenses. By using OpenVPN
@@ -11,7 +11,7 @@ each respective component.
OpenVPN trademark
-----------------
- "OpenVPN" is a trademark of Telethra, Inc.
+ "OpenVPN" is a trademark of OpenVPN Technologies, Inc.
OpenVPN license:
@@ -21,7 +21,7 @@ OpenVPN license:
Special exception for linking OpenVPN with OpenSSL:
- In addition, as a special exception, Telethra, Inc. gives
+ In addition, as a special exception, OpenVPN Technologies, Inc. gives
permission to link the code of this program with the OpenSSL
library (or with modified versions of OpenSSL that use the same
license as OpenSSL), and distribute linked combinations including
@@ -52,9 +52,9 @@ TAP-Win32/TAP-Win64 Driver license:
Damion K. Wilson.
The source and object code of the TAP-Win32/TAP-Win64 driver
- is Copyright (C) 2002-2008 Telethra, Inc., and is released under
+ is Copyright (C) 2002-2008 OpenVPN Technologies, Inc., and is released under
the GPL version 2 (see below), however due to the extra costs of
- supporting Windows Vista, Telethra, Inc. reserves the right to
+ supporting Windows Vista, OpenVPN Technologies, Inc. reserves the right to
change the terms of the TAP-Win32/TAP-Win64 license for versions 9.1
and higher prior to the official release of OpenVPN 2.1.