projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix incorrectly merged bits from 80cd2ff73071941a5356555b85a00ee90dfd0e16.
[tinc]
/
doc
/
SECURITY2
diff --git
a/doc/SECURITY2
b/doc/SECURITY2
index
234f105
..
62d6a07
100644
(file)
--- a/
doc/SECURITY2
+++ b/
doc/SECURITY2
@@
-1,7
+1,7
@@
This is the security documentation for tinc, a Virtual Private Network daemon.
This is the security documentation for tinc, a Virtual Private Network daemon.
- Copyright 2001-200
4
Guus Sliepen <guus@tinc-vpn.org>,
- 2001-200
4
Wessel Dankers <wsl@tinc-vpn.org>
+ Copyright 2001-200
6
Guus Sliepen <guus@tinc-vpn.org>,
+ 2001-200
6
Wessel Dankers <wsl@tinc-vpn.org>
Permission is granted to make and distribute verbatim copies of
this documentation provided the copyright notice and this
Permission is granted to make and distribute verbatim copies of
this documentation provided the copyright notice and this
@@
-12,8
+12,6
@@
This is the security documentation for tinc, a Virtual Private Network daemon.
provided that the entire resulting derived work is distributed
under the terms of a permission notice identical to this one.
provided that the entire resulting derived work is distributed
under the terms of a permission notice identical to this one.
- $Id$
-
Proposed new authentication scheme
----------------------------------
Proposed new authentication scheme
----------------------------------