aboutsummaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-07-14 18:59:09 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2008-07-14 18:59:09 +0000
commit1c0cc4ad89308f3cc3ea26c6e4566e6e29073de7 (patch)
tree2677e70e6feb3b76accf816f60dbe349bc615467 /COPYING
parentVersion 2.1_rc8 (diff)
downloadopenvpn-1c0cc4ad89308f3cc3ea26c6e4566e6e29073de7.tar.xz
Copyright change OpenVPN Solutions LLC -> Telethra, Inc.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3048 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 8a9d9de..5e49716 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
OpenVPN (TM) -- An Open Source VPN daemon
-Copyright (C) 2002-2008 OpenVPN, Inc. <sales@openvpn.net>
+Copyright (C) 2002-2008 Telethra, 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 OpenVPN Solutions LLC.
+ "OpenVPN" is a trademark of Telethra, Inc.
OpenVPN license:
@@ -21,7 +21,7 @@ OpenVPN license:
Special exception for linking OpenVPN with OpenSSL:
- In addition, as a special exception, OpenVPN Solutions LLC gives
+ In addition, as a special exception, Telethra, 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 OpenVPN Solutions LLC, and is released under
+ is Copyright (C) 2002-2008 Telethra, Inc., and is released under
the GPL version 2 (see below), however due to the extra costs of
- supporting Windows Vista, OpenVPN Solutions LLC reserves the right to
+ supporting Windows Vista, Telethra, 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.