j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Merge branch 'master' into 1.1

Browse source
This commit is contained in:
Guus Sliepen 2012-07-27 22:48:24 +02:00
commit 248d300f1b
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
THANKS
View file

@ -31,6 +31,7 @@ We would like to thank the following people for their contributions to tinc:
* Matias Carrasco
* Max Rijevski
* Menno Smits
* Mesar Hameed
* Michael Tokarev
* Miles Nordin
* Nick Hibma

2
doc/tinc.conf.5.in
View file

@ -355,7 +355,7 @@ a lookup if your DNS server is not responding.
.Pp
This does not affect resolving hostnames to IP addresses from the
host configuration files.
host configuration files, but whether hostnames should be resolved while logging.
.It Va IffOneQueue Li = yes | no Po no Pc Bq experimental
(Linux only) Set IFF_ONE_QUEUE flag on TUN/TAP devices.

2
doc/tinc.texi
View file

@ -982,7 +982,7 @@ tinc's efficiency, even stopping the daemon for a few seconds everytime
it does a lookup if your DNS server is not responding.
This does not affect resolving hostnames to IP addresses from the
configuration file.
configuration file, but whether hostnames should be resolved while logging.
@cindex Interface
@item Interface = <@var{interface}>