50 changed files with 2827 additions and 4662 deletions
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-Copyright (C) 1998-2019 Ivo Timmermans, Guus Sliepen and others.
+Copyright (C) 1998-2018 Ivo Timmermans, Guus Sliepen and others.
 See the AUTHORS file for a complete list.
 This program is free software; you can redistribute it and/or modify it under
--- a/46
+++ b/46
@ -1,49 +1,3 @@
 Version 1.0.36                                            August 26 2019
 ------------------------------------------------------------------------
 Guus Sliepen (8):
      Remove the call to RAND_load_file().
      Update THANKS.
      Backport tinc 1.1's str2net() function.
      Update THANKS.
      Fix spelling errors found by codespell.
      Reformat all code using astyle.
      Add a missing check for a pathname being too long.
      Releasing 1.0.36.
 Rosen Penev (2):
      Fix compilation when OpenSSL has no ENGINE support
      Fix compilation without deprecated OpenSSL APIs
 Quentin Rameau (1):
      Double-quote nodes in graphviz network file
 Werner Schreiber (1):
      Fix segfault when dest->mtu is 0.
 Version 1.0.35                                           October 05 2018
 ------------------------------------------------------------------------
 Guus Sliepen (12):
      Prevent oracle attacks (CVE-2018-16737, CVE-2018-16738)
      Prevent a MITM from forcing a NULL cipher for UDP (CVE-2018-16758)
      Check the return value from snprintf().
      Check the return values from BN_hex2bn() and RAND_load_file().
      Fix all warnings when compiling with -Wall -W -pedantic.
      Fix two small memory leaks.
      Don't check for NULL-pointers before calling free().
      Update THANKS.
      Fix checks for Cygwin-related macros.
      Fix spelling errors.
      Update README and links to required libraries.
      Releasing 1.0.35.
 AMRI Amine (1):
      Fixing typo
 Rafael Sadowski (1):
      OpenBSD has a proper tap device.
 Version 1.0.34                                              June 12 2018
 ------------------------------------------------------------------------
--- a/Makefile.in
+++ b/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -141,9 +141,9 @@ am__recursive_targets = \
  $(RECURSIVE_CLEAN_TARGETS) \
  $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir distdir-am dist dist-all distcheck
+	cscope distdir dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-	config.h.in
+	$(LISP)config.h.in
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
@ -335,8 +335,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -469,10 +469,7 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-distdir: $(BUILT_SOURCES)
+distdir: $(DISTFILES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 distdir-am: $(DISTFILES)
 	@case `sed 15q $(srcdir)/NEWS` in \
 	*"$(VERSION)"*) : ;; \
 	*) \
@ -558,10 +555,6 @@ dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__post_remove_distdir)
 dist-zstd: distdir
 	tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
 	$(am__post_remove_distdir)
 dist-tarZ: distdir
 	@echo WARNING: "Support for distribution archives compressed with" \
 		       "legacy program 'compress' is deprecated." >&2
@ -604,8 +597,6 @@ distcheck: dist
 	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	*.tar.zst*) \
 	  zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
@ -782,7 +773,7 @@ uninstall-am:
 	am--refresh check check-am clean clean-cscope clean-generic \
 	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
 	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
-	dist-zstd distcheck distclean distclean-generic distclean-hdr \
+	distcheck distclean distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-dvi install-dvi-am \
--- a/19
+++ b/19
@ -1,22 +1,3 @@
 Version 1.0.36               August 26 2019
 * Fix compiling tinc with certain versions of the OpenSSL library.
 * Fix parsing some IPv6 addresses with :: in them.
 * Fix GraphDumpFile output to handle node names starting with a digit.
 * Fix a potential segmentation fault when fragmenting packets.
 Thanks to Rosen Penev, Quentin Rameau and Werner Schreiber for their
 contributions to this version of tinc.
 Version 1.0.35               October 5 2018
 * Prevent oracle attacks (CVE-2018-16737, CVE-2018-16738).
 * Prevent a MITM from forcing a NULL cipher for UDP (CVE-2018-16758).
 * Minor fixes in the documentation.
 Thanks to Amine Amri and Rafael Sadowski for their contributions to this
 version of tinc.
 Version 1.0.34               June 12 2018
 * Fix a potential segmentation fault when connecting to an IPv6 peer via a
--- a/45
+++ b/45
@ -1,7 +1,7 @@
-This is the README file for tinc version 1.0.36. Installation
+This is the README file for tinc version 1.0.34. Installation
 instructions may be found in the INSTALL file.
-tinc is Copyright (C) 1998-2019 by:
+tinc is Copyright (C) 1998-2018 by:
 Ivo Timmermans,
 Guus Sliepen <guus@tinc-vpn.org>,
@ -41,25 +41,24 @@ issues are being addressed in the tinc 1.1 branch.
 The Sweet32 attack affects versions of tinc prior to 1.0.30.
 On September 6th, 2018, Michael Yonly contacted us and provided
 proof-of-concept code that allowed a remote attacker to create an
 authenticated, one-way connection with a node, and also that there was a
 possibility for a man-in-the-middle to force UDP packets from a node to be sent
 in plaintext. The first issue was trivial to exploit on tinc versions prior to
 1.0.30, but the changes in 1.0.30 to mitigate the Sweet32 attack made this
 weakness much harder to exploit. These issues have been fixed in tinc 1.0.35.
 The new protocol in the tinc 1.1 branch is not susceptible to these issues.
 Cryptography is a hard thing to get right. We cannot make any
 guarantees. Time, review and feedback are the only things that can
 prove the security of any cryptographic product. If you wish to review
 tinc or give us feedback, you are strongly encouraged to do so.
 Changes to configuration file format since 1.0pre5
 --------------------------------------------------
 Some configuration variables have different names now. Most notably "TapDevice"
 should be changed into "Device", and "Device" should be changed into
 "BindToDevice".
 Compatibility
 -------------
-Version 1.0.35 is compatible with 1.0pre8, 1.0 and later, but not with older
+Version 1.0.31 is compatible with 1.0pre8, 1.0 and later, but not with older
 versions of tinc. Note that since version 1.0.30, tinc requires all nodes in
 the VPN to be compiled with a version of LibreSSL or OpenSSL that supports the
 AES256 and SHA256 algorithms.
@ -68,21 +67,21 @@ AES256 and SHA256 algorithms.
 Requirements
 ------------
-The OpenSSL library is used for all cryptographic functions. You can find it at
+Since 1.0pre3, we use OpenSSL for all cryptographic functions.  So you need to
-https://www.openssl.org/. You will need version 1.0.1 or later with support for
+install this library first; grab it from http://www.openssl.org/. You will
-AES256 and SHA256 enabled. If this library is not installed on your system, the
+need version 1.0.1 or later with support for AES256 and SHA256 enabled. If
-configure script will fail.  The manual in doc/tinc.texi contains more detailed
+this library is not installed on you system, configure will fail. The manual
-information on how to install this library. Alternatively, you may also use the
+in doc/tinc.texi contains more detailed information on how to install this
-LibreSSL library.
+library. Alternatively, you may also use LibreSSL.
-The zlib library is used for optional compression. You can
+Since 1.0pre6, the zlib library is used for optional compression. You can
-find it at https://zlib.net/. Because of a possible exploit in
+find it at http://www.gzip.org/zlib/. Because of a possible exploit in
 earlier versions we recommend that you download version 1.1.4 or later.
-The LZO library is also used for optional compression. You can
+Since 1.0, the lzo library is also used for optional compression. You can
-find it at https://www.oberhumer.com/opensource/lzo/.
+find it at http://www.oberhumer.com/opensource/lzo/.
-In order to compile tinc, you will need a C99 compliant compiler.
+In order to compile tinc, you will need a GNU C compiler environment.
 Features
--- a/9
+++ b/9
@ -5,7 +5,6 @@ We would like to thank the following people for their contributions to tinc:
 * Alexis Hildebrandt
 * Allesandro Gatti
 * Andreas van Cranenburgh
 * Andrew Hahn
 * Anthony G. Basile
 * Armijn Hemel
 * Armin Fisslthaler
@ -22,7 +21,6 @@ We would like to thank the following people for their contributions to tinc:
 * Delf Eldkraft
 * Dennis Joachimsthaler
 * dnk
 * Егор Палкин
 * Élie Bouttier
 * Enrique Zanardi
 * Erik Tews
@ -43,10 +41,8 @@ We would like to thank the following people for their contributions to tinc:
 * James Cook
 * James MacLean
 * Jamie Briggs
 * Jan Štembera
 * Jason Harper
 * Jason Livesay
 * Jasper Krijgsman
 * Jelle de Jong
 * Jeroen Domburg
 * Jeroen Ubbink
@ -73,9 +69,7 @@ We would like to thank the following people for their contributions to tinc:
 * Max Rijevski
 * Menno Smits
 * Mesar Hameed
 * Michael Taylor
 * Michael Tokarev
 * Michael Yonli
 * Miles Nordin
 * Nathan Stratton Treadway
 * Murat Donmez
@ -85,12 +79,10 @@ We would like to thank the following people for their contributions to tinc:
 * Philipp Babel
 * Pierre Emeriaud
 * Pierre-Olivier Mercier
 * Rafael Wolf
 * Rafael Sadowski
 * Rafał Leśniak
 * Rhosyn Celyn
 * Robert van der Meulen
 * Robert Waniek
 * Rumko
 * Ryan Miller
 * Sam Bryan
@ -109,7 +101,6 @@ We would like to thank the following people for their contributions to tinc:
 * Tonnerre Lombard
 * Ulrich Seifert
 * Vil Brekin
 * Vincent Laurent
 * Vittorio Gambaletta
 * Wendy Willard
 * Wessel Dankers
--- a/aclocal.m4
+++ b/aclocal.m4
@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -20,7 +20,7 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2020 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.16'
+[am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.16.2], [],
+m4_if([$1], [1.15.1], [],
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.2])dnl
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -110,7 +110,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
 # AM_CONDITIONAL                                            -*- Autoconf -*-
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -141,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -332,12 +332,13 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
@ -345,43 +346,49 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
  # Older Autoconf quotes --file arguments for eval, but not when files
  # are listed without --file.  Let's play safe and only enable the eval
  # if we detect the quoting.
-  # TODO: see whether this extra hack can be removed once we start
+  case $CONFIG_FILES in
-  # requiring Autoconf 2.70 or later.
+  *\'*) eval set x "$CONFIG_FILES" ;;
-  AS_CASE([$CONFIG_FILES],
+  *)   set x $CONFIG_FILES ;;
-          [*\'*], [eval set x "$CONFIG_FILES"],
+  esac
          [*], [set x $CONFIG_FILES])
  shift
-  # Used to flag and report bootstrapping failures.
+  for mf
  am_rc=0
  for am_mf
  do
    # Strip MF so we end up with the name of the file.
-    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile which includes
+    # Check whether this is an Automake generated Makefile or not.
-    # dependency-tracking related rules and includes.
+    # We used to match only the files named 'Makefile.in', but
-    # Grep'ing the whole file directly is not great: AIX grep has a line
+    # some people rename them; so instead we look at the file content.
    # Grep'ing the first line is not enough: some people post-process
    # each Makefile.in and add a new line on top of each file to say so.
    # Grep'ing the whole file is not good either: AIX grep has a line
    # limit of 2048, but all sed's we know have understand at least 4000.
-    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      || continue
+      dirpart=`AS_DIRNAME("$mf")`
-    am_dirpart=`AS_DIRNAME(["$am_mf"])`
+    else
-    am_filepart=`AS_BASENAME(["$am_mf"])`
+      continue
-    AM_RUN_LOG([cd "$am_dirpart" \
+    fi
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
+    # Extract the definition of DEPDIR, am__include, and am__quote
-        | $MAKE -f - am--depfiles]) || am_rc=$?
+    # from the Makefile without running 'make'.
    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
    test -z "$DEPDIR" && continue
    am__include=`sed -n 's/^am__include = //p' < "$mf"`
    test -z "$am__include" && continue
    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
    # Find all dependency output files, they are included files with
    # $(DEPDIR) in their names.  We invoke sed twice because it is the
    # simplest approach to changing $(DEPDIR) to its actual value in the
    # expansion.
    for file in `sed -n "
      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
 	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
      fdir=`AS_DIRNAME(["$file"])`
      AS_MKDIR_P([$dirpart/$fdir])
      # echo "creating $dirpart/$file"
      echo '# dummy' > "$dirpart/$file"
    done
  done
  if test $am_rc -ne 0; then
    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
    for automatic dependency tracking.  If GNU make was not used, consider
    re-running the configure script with MAKE="gmake" (or whatever is
    necessary).  You can also try re-running configure with the
    '--disable-dependency-tracking' option to at least be able to build
    the package (albeit without support for automatic dependency tracking).])
  fi
  AS_UNSET([am_dirpart])
  AS_UNSET([am_filepart])
  AS_UNSET([am_mf])
  AS_UNSET([am_rc])
  rm -f conftest-deps.mk
 }
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
@ -390,17 +397,18 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # -----------------------------
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
-# This code is only required when automatic dependency tracking is enabled.
+# This code is only required when automatic dependency tracking
-# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# is enabled.  FIXME.  This creates each '.P' file that we will
-# order to bootstrap the dependency handling code.
+# need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 # Do all the work for Automake.                             -*- Autoconf -*-
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -487,8 +495,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target (and possibly the TAP driver).  The
 # system "awk" is bad on some platforms.
@ -555,7 +563,7 @@ END
 Aborting the configuration process, to ensure you take notice of the issue.
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@ -597,7 +605,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -618,7 +626,7 @@ if test x"${install_sh+set}" != xset; then
 fi
 AC_SUBST([install_sh])])
-# Copyright (C) 2003-2020 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -639,7 +647,7 @@ AC_SUBST([am__leading_dot])])
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -647,42 +655,49 @@ AC_SUBST([am__leading_dot])])
 # AM_MAKE_INCLUDE()
 # -----------------
-# Check whether make has an 'include' directive that can support all
+# Check to see how make treats includes.
 # the idioms we need for our automatic dependency tracking code.
 AC_DEFUN([AM_MAKE_INCLUDE],
-[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+[am_make=${MAKE-make}
-cat > confinc.mk << 'END'
+cat > confinc << 'END'
 am__doit:
-	@echo this is the am__doit target >confinc.out
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
 AC_MSG_CHECKING([for style of include used by $am_make])
 am__include="#"
 am__quote=
-# BSD make does it like this.
+_am_result=none
-echo '.include "confinc.mk" # ignored' > confmf.BSD
+# First try GNU make style include.
-# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo "include confinc" > confmf
-echo 'include confinc.mk # ignored' > confmf.GNU
+# Ignore all kinds of additional output from 'make'.
-_am_result=no
+case `$am_make -s -f confmf 2> /dev/null` in #(
-for s in GNU BSD; do
+*the\ am__doit\ target*)
-  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+  am__include=include
-  AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+  am__quote=
-      ['0:this is the am__doit target'],
+  _am_result=GNU
-      [AS_CASE([$s],
+  ;;
-          [BSD], [am__include='.include' am__quote='"'],
+esac
-          [am__include='include' am__quote=''])])
+# Now try BSD make style include.
-  if test "$am__include" != "#"; then
+if test "$am__include" = "#"; then
-    _am_result="yes ($s style)"
+   echo '.include "confinc"' > confmf
-    break
+   case `$am_make -s -f confmf 2> /dev/null` in #(
-  fi
+   *the\ am__doit\ target*)
-done
+     am__include=.include
-rm -f confinc.* confmf.*
+     am__quote="\""
-AC_MSG_RESULT([${_am_result}])
+     _am_result=BSD
-AC_SUBST([am__include])])
+     ;;
-AC_SUBST([am__quote])])
+   esac
 fi
 AC_SUBST([am__include])
 AC_SUBST([am__quote])
 AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-# Copyright (C) 1997-2020 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -721,7 +736,7 @@ fi
 # Helper functions for option handling.                     -*- Autoconf -*-
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -750,7 +765,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -797,7 +812,7 @@ AC_LANG_POP([C])])
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -816,7 +831,7 @@ AC_DEFUN([AM_RUN_LOG],
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -897,7 +912,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])
-# Copyright (C) 2009-2020 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -957,7 +972,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
-# Copyright (C) 2001-2020 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -985,7 +1000,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2020 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -1004,7 +1019,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Check how to create a tarball.                            -*- Autoconf -*-
-# Copyright (C) 2004-2020 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
--- a/17
+++ b/17
@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@ -17,7 +17,7 @@ scriptversion=2018-03-07.03; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
-	  CYGWIN* | MSYS*)
+	  CYGWIN*)
 	    file_conv=cygwin
 	    ;;
 	  *)
@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/* | msys/*)
+	cygwin/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@ -255,8 +255,7 @@ EOF
    echo "compile $scriptversion"
    exit $?
    ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
    func_cl_wrapper "$@"      # Doesn't return...
    ;;
 esac
@ -340,9 +339,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:
--- a/213
+++ b/213
@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for tinc 1.0.36.
+# Generated by GNU Autoconf 2.69 for tinc 1.0.34.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='tinc'
 PACKAGE_TARNAME='tinc'
-PACKAGE_VERSION='1.0.36'
+PACKAGE_VERSION='1.0.34'
-PACKAGE_STRING='tinc 1.0.36'
+PACKAGE_STRING='tinc 1.0.34'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
@ -662,6 +662,7 @@ am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
 am__quote
 am__include
 DEPDIR
 OBJEXT
@ -736,8 +737,7 @@ PACKAGE_VERSION
 PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
-SHELL
+SHELL'
 am__quote'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
@ -1321,7 +1321,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures tinc 1.0.36 to adapt to many kinds of systems.
+\`configure' configures tinc 1.0.34 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1392,7 +1392,7 @@ fi
 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of tinc 1.0.36:";;
+     short | recursive ) echo "Configuration of tinc 1.0.34:";;
   esac
  cat <<\_ACEOF
@ -1509,7 +1509,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-tinc configure 1.0.36
+tinc configure 1.0.34
 generated by GNU Autoconf 2.69
 Copyright (C) 2012 Free Software Foundation, Inc.
@ -1974,7 +1974,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
-It was created by tinc $as_me 1.0.36, which was
+It was created by tinc $as_me 1.0.34, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
  $ $0 $@
@ -2323,7 +2323,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-am__api_version='1.16'
+am__api_version='1.15'
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@ -2838,7 +2838,7 @@ fi
 # Define the identity of the package.
 PACKAGE='tinc'
- VERSION='1.0.36'
+ VERSION='1.0.34'
 cat >>confdefs.h <<_ACEOF
@ -2868,8 +2868,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 # We need awk for the "check" target (and possibly the TAP driver).  The
@ -2920,7 +2920,7 @@ END
 Aborting the configuration process, to ensure you take notice of the issue.
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
@ -2981,45 +2981,45 @@ DEPDIR="${am__leading_dot}deps"
 ac_config_commands="$ac_config_commands depfiles"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+
-$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+am_make=${MAKE-make}
-cat > confinc.mk << 'END'
+cat > confinc << 'END'
 am__doit:
-	@echo this is the am__doit target >confinc.out
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
 $as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
-# BSD make does it like this.
+_am_result=none
-echo '.include "confinc.mk" # ignored' > confmf.BSD
+# First try GNU make style include.
-# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo "include confinc" > confmf
-echo 'include confinc.mk # ignored' > confmf.GNU
+# Ignore all kinds of additional output from 'make'.
-_am_result=no
+case `$am_make -s -f confmf 2> /dev/null` in #(
-for s in GNU BSD; do
+*the\ am__doit\ target*)
-  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+  am__include=include
-   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+  am__quote=
-   ac_status=$?
+  _am_result=GNU
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  ;;
   (exit $ac_status); }
  case $?:`cat confinc.out 2>/dev/null` in #(
  '0:this is the am__doit target') :
    case $s in #(
  BSD) :
    am__include='.include' am__quote='"' ;; #(
  *) :
    am__include='include' am__quote='' ;;
 esac ;; #(
  *) :
     ;;
 esac
-  if test "$am__include" != "#"; then
+# Now try BSD make style include.
-    _am_result="yes ($s style)"
+if test "$am__include" = "#"; then
-    break
+   echo '.include "confinc"' > confmf
-  fi
+   case `$am_make -s -f confmf 2> /dev/null` in #(
-done
+   *the\ am__doit\ target*)
-rm -f confinc.* confmf.*
+     am__include=.include
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+     am__quote="\""
-$as_echo "${_am_result}" >&6; }
+     _am_result=BSD
     ;;
   esac
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
 $as_echo "$_am_result" >&6; }
 rm -f confinc confmf
 # Check whether --enable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then :
@ -7333,7 +7333,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by tinc $as_me 1.0.36, which was
+This file was extended by tinc $as_me 1.0.34, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
  CONFIG_FILES    = $CONFIG_FILES
@ -7399,7 +7399,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-tinc config.status 1.0.36
+tinc config.status 1.0.34
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"
@ -7518,7 +7518,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
-AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 _ACEOF
@ -8133,35 +8133,29 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
  # Older Autoconf quotes --file arguments for eval, but not when files
  # are listed without --file.  Let's play safe and only enable the eval
  # if we detect the quoting.
-  # TODO: see whether this extra hack can be removed once we start
+  case $CONFIG_FILES in
-  # requiring Autoconf 2.70 or later.
+  *\'*) eval set x "$CONFIG_FILES" ;;
-  case $CONFIG_FILES in #(
+  *)   set x $CONFIG_FILES ;;
-  *\'*) :
+  esac
    eval set x "$CONFIG_FILES" ;; #(
  *) :
    set x $CONFIG_FILES ;; #(
  *) :
     ;;
 esac
  shift
-  # Used to flag and report bootstrapping failures.
+  for mf
  am_rc=0
  for am_mf
  do
    # Strip MF so we end up with the name of the file.
-    am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile which includes
+    # Check whether this is an Automake generated Makefile or not.
-    # dependency-tracking related rules and includes.
+    # We used to match only the files named 'Makefile.in', but
-    # Grep'ing the whole file directly is not great: AIX grep has a line
+    # some people rename them; so instead we look at the file content.
    # Grep'ing the first line is not enough: some people post-process
    # each Makefile.in and add a new line on top of each file to say so.
    # Grep'ing the whole file is not good either: AIX grep has a line
    # limit of 2048, but all sed's we know have understand at least 4000.
-    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      || continue
+      dirpart=`$as_dirname -- "$mf" ||
-    am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$am_mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
-	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$mf" |
 $as_echo X"$am_mf" |
    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@ -8179,50 +8173,53 @@ $as_echo X"$am_mf" |
 	    q
 	  }
 	  s/.*/./; q'`
-    am_filepart=`$as_basename -- "$am_mf" ||
+    else
-$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+      continue
-	 X"$am_mf" : 'X\(//\)$' \| \
+    fi
-	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+    # Extract the definition of DEPDIR, am__include, and am__quote
-$as_echo X/"$am_mf" |
+    # from the Makefile without running 'make'.
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
    test -z "$DEPDIR" && continue
    am__include=`sed -n 's/^am__include = //p' < "$mf"`
    test -z "$am__include" && continue
    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
    # Find all dependency output files, they are included files with
    # $(DEPDIR) in their names.  We invoke sed twice because it is the
    # simplest approach to changing $(DEPDIR) to its actual value in the
    # expansion.
    for file in `sed -n "
      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
 	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
      fdir=`$as_dirname -- "$file" ||
 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$file" : 'X\(//\)[^/]' \| \
 	 X"$file" : 'X\(//\)$' \| \
 	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X"$file" |
    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
 	  }
-	  /^X\/\(\/\/\)$/{
+	  /^X\(\/\/\)[^/].*/{
 	    s//\1/
 	    q
 	  }
-	  /^X\/\(\/\).*/{
+	  /^X\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
-    { echo "$as_me:$LINENO: cd "$am_dirpart" \
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      && sed -e '/# am--include-marker/d' "$am_filepart" \
+      # echo "creating $dirpart/$file"
-        | $MAKE -f - am--depfiles" >&5
+      echo '# dummy' > "$dirpart/$file"
-   (cd "$am_dirpart" \
+    done
      && sed -e '/# am--include-marker/d' "$am_filepart" \
        | $MAKE -f - am--depfiles) >&5 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } || am_rc=$?
  done
  if test $am_rc -ne 0; then
    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "Something went wrong bootstrapping makefile fragments
    for automatic dependency tracking.  If GNU make was not used, consider
    re-running the configure script with MAKE=\"gmake\" (or whatever is
    necessary).  You can also try re-running configure with the
    '--disable-dependency-tracking' option to at least be able to build
    the package (albeit without support for automatic dependency tracking).
 See \`config.log' for more details" "$LINENO" 5; }
  fi
  { am_dirpart=; unset am_dirpart;}
  { am_filepart=; unset am_filepart;}
  { am_mf=; unset am_mf;}
  { am_rc=; unset am_rc;}
  rm -f conftest-deps.mk
 }
 ;;
--- a/configure.ac
+++ b/configure.ac
@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.61)
-AC_INIT([tinc], [1.0.36])
+AC_INIT([tinc], [1.0.34])
 AC_CONFIG_SRCDIR([src/tincd.c])
 AM_INIT_AUTOMAKE([1.11 check-news std-options subdir-objects nostdinc silent-rules -Wall])
 AC_CONFIG_HEADERS([config.h])
@ -237,7 +237,7 @@ AC_ARG_ENABLE(jumbograms,
  ]
 )
-dnl Ensure runstatedir is set if we are using a version of autoconf that does not support it
+dnl Ensure runstatedir is set if we are using a version of autoconf that does not suppport it
 if test "x$runstatedir" = "x"; then
  AC_SUBST([runstatedir], ['${localstatedir}/run'])
 fi
--- a/debian/changelog
+++ b/debian/changelog
@ -1,33 +1,3 @@
 tinc (1.0.36-2) unstable; urgency=medium
  * Disable support for libvdeplug. Closes: #973233
 -- Guus Sliepen <guus@debian.org>  Sun, 22 Nov 2020 10:40:27 +0100
 tinc (1.0.36-1) unstable; urgency=medium
  * New upstream version 1.0.36
  * Add Vcs tags to debian/control.
  * Bump Standards-Version.
 -- Guus Sliepen <guus@debian.org>  Mon, 26 Aug 2019 14:17:21 +0200
 tinc (1.0.35-2) unstable; urgency=medium
  * Bump Standards-Version and Build-Depend on debhelper-compat (= 12).
  * Remove calls to dh_installinit and dh_systemd_start from debian/rules,
    compat level 12 does the right thing by default.
  * Ensure we clean up doc/tinc.info.
 -- Guus Sliepen <guus@debian.org>  Mon, 28 Jan 2019 21:54:45 +0100
 tinc (1.0.35-1) unstable; urgency=medium
  * New upstream release.
    - Includes fixes for CVE-2018-16737, CVE-2018-16738, CVE-2018-16758.
 -- Guus Sliepen <guus@debian.org>  Mon, 08 Oct 2018 16:09:06 +0200
 tinc (1.0.34-1) unstable; urgency=medium
  [ Guus Sliepen ]
--- a/debian/compat
+++ b/debian/compat
@ -0,0 +1 @@
 10
--- a/debian/control
+++ b/debian/control
@ -2,16 +2,13 @@ Source: tinc
 Section: net
 Priority: optional
 Maintainer: Guus Sliepen <guus@debian.org>
-Standards-Version: 4.4.0
+Standards-Version: 4.1.3
-Build-Depends: libssl-dev, debhelper-compat (= 12), gettext, texinfo, zlib1g-dev, liblzo2-dev
+Build-Depends: libssl-dev, debhelper (>= 10), gettext, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev
 Homepage: http://www.tinc-vpn.org/
 Vcs-Browser: https://salsa.debian.org/guus/tinc
 Vcs-Git: https://salsa.debian.org/guus/tinc.git
 Rules-Requires-Root: no
 Package: tinc
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6)
 Description: Virtual Private Network daemon
 tinc is a daemon with which you can create a virtual private network
--- a/debian/rules
+++ b/debian/rules
@ -3,14 +3,16 @@
 %:
 	dh $@
 override_dh_clean:
 	dh_clean
 	rm -f doc/tinc.info
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-uml --with-systemd=/lib/systemd/system --runstatedir=/run
+	dh_auto_configure -- --enable-uml --enable-vde --with-systemd=/lib/systemd/system --runstatedir=/run
 override_dh_auto_install:
 	dh_auto_install -- install-html
 	# Remove info dir file
 	rm -f debian/tinc/usr/share/info/dir
 override_dh_installinit:
 	dh_installinit -R
 override_dh_systemd_start:
 	dh_systemd_start --restart-after-upgrade
--- a/8
+++ b/8
@ -1,9 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -16,7 +16,7 @@ scriptversion=2018-03-07.03; # UTC
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@ -783,7 +783,7 @@ exit 0
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -329,8 +329,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -575,10 +575,7 @@ ctags CTAGS:
 cscope cscopelist:
-distdir: $(BUILT_SOURCES)
+distdir: $(DISTFILES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
--- a/doc/tinc.info
+++ b/doc/tinc.info
@ -1,14 +1,14 @@
-This is tinc.info, produced by makeinfo version 6.7 from tinc.texi.
+This is tinc.info, produced by makeinfo version 6.5 from tinc.texi.
 INFO-DIR-SECTION Networking tools
 START-INFO-DIR-ENTRY
 * tinc: (tinc).              The tinc Manual.
 END-INFO-DIR-ENTRY
-This is the info manual for tinc version 1.0.36, a Virtual Private
+This is the info manual for tinc version 1.0.34, a Virtual Private
 Network daemon.
-   Copyright (C) 1998-2019 Ivo Timmermans, Guus Sliepen
+   Copyright (C) 1998-2018 Ivo Timmermans, Guus Sliepen
 <guus@tinc-vpn.org> and Wessel Dankers <wsl@tinc-vpn.org>.
   Permission is granted to make and distribute verbatim copies of this
@ -117,10 +117,10 @@ for both the receiving and sending end, it has become largely
 runtime-configurable--in short, it has become a full-fledged
 professional package.
-   Tinc also allows more than two sites to connect to each other and
+   Tinc also allows more than two sites to connect to eachother and form
-form a single VPN. Traditionally VPNs are created by making tunnels,
+a single VPN. Traditionally VPNs are created by making tunnels, which
-which only have two endpoints.  Larger VPNs with more sites are created
+only have two endpoints.  Larger VPNs with more sites are created by
-by adding more tunnels.  Tinc takes another approach: only endpoints are
+adding more tunnels.  Tinc takes another approach: only endpoints are
 specified, the software itself will take care of creating the tunnels.
 This allows for easier configuration and improved scalability.
@ -373,9 +373,9 @@ if available.  Make sure you install the development AND runtime
 versions of this package.
   If you have to install zlib manually, you can get the source code
-from <https://zlib.net/>.  Instructions on how to configure, build and
+from <http://www.zlib.net/>.  Instructions on how to configure, build
-install this package are included within the package.  Please make sure
+and install this package are included within the package.  Please make
-you build development and runtime libraries (which is the default).
+sure you build development and runtime libraries (which is the default).
 File: tinc.info,  Node: lzo,  Prev: zlib,  Up: Libraries
@ -791,13 +791,13 @@ DeviceType = <TYPE> (platform dependent)
     uml (not compiled in by default)
          Create a UNIX socket with the filename specified by DEVICE, or
-          '/run/NETNAME.umlsocket' if not specified.  Tinc will wait for
+          '/var/run/NETNAME.umlsocket' if not specified.  Tinc will wait
-          a User Mode Linux instance to connect to this socket.
+          for a User Mode Linux instance to connect to this socket.
     vde (not compiled in by default)
          Uses the libvdeplug library to connect to a Virtual
          Distributed Ethernet switch, using the UNIX socket specified
-          by DEVICE, or '/run/vde.ctl' if not specified.
+          by DEVICE, or '/var/run/vde.ctl' if not specified.
     Also, in case tinc does not seem to correctly interpret packets
     received from the virtual network device, it can be used to change
@ -1597,7 +1597,7 @@ command line options.
     '/var/log/tinc.NETNAME.log'.
 '--pidfile=FILE'
-     Write PID to FILE instead of '/run/tinc.NETNAME.pid'.
+     Write PID to FILE instead of '/var/run/tinc.NETNAME.pid'.
 '--bypass-security'
     Disables encryption and authentication.  Only useful for debugging.
@ -1939,7 +1939,8 @@ correct destination MAC address.  In those modes every interface should
 have a unique MAC address, so make sure they are not the same.  Because
 switch and hub modes rely on MAC addresses to function correctly, these
 modes cannot be used on the following operating systems which don't have
-a 'tap' style virtual network device: NetBSD, Darwin and Solaris.
+a 'tap' style virtual network device: OpenBSD, NetBSD, Darwin and
 Solaris.
 File: tinc.info,  Node: The meta-connection,  Prev: The UDP tunnel,  Up: The connection
@ -2278,7 +2279,7 @@ address these issues in tinc 2.0.
   Cryptography is a hard thing to get right.  We cannot make any
 guarantees.  Time, review and feedback are the only things that can
 prove the security of any cryptographic product.  If you wish to review
-tinc or give us feedback, you are strongly encouraged to do so.
+tinc or give us feedback, you are stronly encouraged to do so.
 File: tinc.info,  Node: Platform specific information,  Next: About us,  Prev: Technical information,  Up: Top
@ -2329,6 +2330,11 @@ Solaris             'ifconfig' INTERFACE 'inet6 plumb up'
 Darwin (Mac OS X)   'ifconfig' INTERFACE 'inet6' ADDRESS 'prefixlen' PREFIXLENGTH
 Windows             'netsh interface ipv6 add address' INTERFACE 'static' ADDRESS/PREFIXLENGTH
   On some platforms, when running tinc in switch mode, the VPN
 interface must be set to tap mode with an ifconfig command:
 OpenBSD             'ifconfig' INTERFACE 'link0'
   On Linux, it is possible to create a persistent tun/tap interface
 which will continue to exist even if tinc quit, although this is
 normally not required.  It can be useful to set up a tun/tap interface
@ -2720,71 +2726,66 @@ Node: Top806
 Node: Introduction1105
 Node: Virtual Private Networks1915
 Node: tinc3639
-Node: Supported platforms5167
+Node: Supported platforms5166
-Node: Preparations5868
+Node: Preparations5867
-Node: Configuring the kernel6124
+Node: Configuring the kernel6123
-Node: Configuration of Linux kernels6534
+Node: Configuration of Linux kernels6533
-Node: Configuration of FreeBSD kernels7389
+Node: Configuration of FreeBSD kernels7388
-Node: Configuration of OpenBSD kernels7854
+Node: Configuration of OpenBSD kernels7853
-Node: Configuration of NetBSD kernels8211
+Node: Configuration of NetBSD kernels8210
-Node: Configuration of Solaris kernels8616
+Node: Configuration of Solaris kernels8615
-Node: Configuration of Darwin (Mac OS X) kernels9279
+Node: Configuration of Darwin (Mac OS X) kernels9278
-Node: Configuration of Windows10098
+Node: Configuration of Windows10097
-Node: Libraries10638
+Node: Libraries10637
-Node: LibreSSL/OpenSSL11047
+Node: LibreSSL/OpenSSL11046
-Node: zlib13589
+Node: zlib13588
-Node: lzo14618
+Node: lzo14620
-Node: Installation15601
+Node: Installation15603
-Node: Building and installing tinc16511
+Node: Building and installing tinc16513
-Node: Darwin (Mac OS X) build environment17171
+Node: Darwin (Mac OS X) build environment17173
-Node: Cygwin (Windows) build environment17736
+Node: Cygwin (Windows) build environment17738
-Node: MinGW (Windows) build environment18325
+Node: MinGW (Windows) build environment18327
-Node: System files18919
+Node: System files18921
-Node: Device files19184
+Node: Device files19186
-Node: Other files19600
+Node: Other files19602
-Node: Configuration20213
+Node: Configuration20215
-Node: Configuration introduction20524
+Node: Configuration introduction20526
-Node: Multiple networks21792
+Node: Multiple networks21794
-Node: How connections work23218
+Node: How connections work23220
-Node: Configuration files24440
+Node: Configuration files24442
-Node: Main configuration variables25934
+Node: Main configuration variables25936
-Node: Host configuration variables42182
+Node: Host configuration variables42192
-Node: Scripts47714
+Node: Scripts47724
-Node: How to configure50980
+Node: How to configure50990
-Node: Generating keypairs52238
+Node: Generating keypairs52248
-Node: Network interfaces52737
+Node: Network interfaces52747
-Node: Example configuration54585
+Node: Example configuration54595
-Node: Running tinc59910
+Node: Running tinc59920
-Node: Runtime options60500
+Node: Runtime options60510
-Node: Signals64125
+Node: Signals64139
-Node: Debug levels65316
+Node: Debug levels65330
-Node: Solving problems66252
+Node: Solving problems66266
-Node: Error messages67804
+Node: Error messages67818
-Node: Sending bug reports71813
+Node: Sending bug reports71827
-Node: Technical information72760
+Node: Technical information72774
-Node: The connection72991
+Node: The connection73005
-Node: The UDP tunnel73303
+Node: The UDP tunnel73317
-Node: The meta-connection76355
+Node: The meta-connection76378
-Node: The meta-protocol77824
+Node: The meta-protocol77847
-Node: Security82841
+Node: Security82864
-Node: Authentication protocol83983
+Node: Authentication protocol84006
-Node: Encryption of network packets89028
+Node: Encryption of network packets89051
-Node: Security issues90404
+Node: Security issues90427
-Node: Platform specific information92044
+Node: Platform specific information92066
-Node: Interface configuration92304
+Node: Interface configuration92326
-Node: Routes94600
+Node: Routes94797
-Node: Automatically starting tinc96650
+Node: Automatically starting tinc96847
-Node: Linux96873
+Node: Linux97070
-Node: Windows98094
+Node: Windows98291
-Node: Other platforms98599
+Node: Other platforms98796
-Node: About us98881
+Node: About us99078
-Node: Contact information99056
+Node: Contact information99253
-Node: Authors99459
+Node: Authors99656
-Node: Concept Index99864
+Node: Concept Index100061
 End Tag Table
 Local Variables:
 coding: utf-8
 End:
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@ -15,7 +15,7 @@
 This is the info manual for @value{PACKAGE} version @value{VERSION}, a Virtual Private Network daemon.
-Copyright @copyright{} 1998-2019 Ivo Timmermans,
+Copyright @copyright{} 1998-2018 Ivo Timmermans,
 Guus Sliepen <guus@@tinc-vpn.org> and
 Wessel Dankers <wsl@@tinc-vpn.org>.
@ -39,7 +39,7 @@ permission notice identical to this one.
@vskip 0pt plus 1filll
 This is the info manual for @value{PACKAGE} version @value{VERSION}, a Virtual Private Network daemon.
-Copyright @copyright{} 1998-2019 Ivo Timmermans,
+Copyright @copyright{} 1998-2018 Ivo Timmermans,
 Guus Sliepen <guus@@tinc-vpn.org> and
 Wessel Dankers <wsl@@tinc-vpn.org>.
@ -155,7 +155,7 @@ professional package.
@cindex traditional VPNs
@cindex scalability
-Tinc also allows more than two sites to connect to each other and form a single VPN.
+Tinc also allows more than two sites to connect to eachother and form a single VPN.
 Traditionally VPNs are created by making tunnels, which only have two endpoints.
 Larger VPNs with more sites are created by adding more tunnels.
 Tinc takes another approach: only endpoints are specified,
@ -421,7 +421,7 @@ available.  Make sure you install the development AND runtime versions
 of this package.
 If you have to install zlib manually, you can get the source code
-from @url{https://zlib.net/}.  Instructions on how to configure,
+from @url{http://www.zlib.net/}.  Instructions on how to configure,
 build and install this package are included within the package.  Please
 make sure you build development and runtime libraries (which is the
 default).
@ -2075,7 +2075,7 @@ In switch or hub modes ARP does work so the sender already knows the correct des
 In those modes every interface should have a unique MAC address, so make sure they are not the same.
 Because switch and hub modes rely on MAC addresses to function correctly,
 these modes cannot be used on the following operating systems which don't have a `tap' style virtual network device:
-NetBSD, Darwin and Solaris.
+OpenBSD, NetBSD, Darwin and Solaris.
@c ==================================================================
@ -2433,7 +2433,7 @@ We will address these issues in tinc 2.0.
 Cryptography is a hard thing to get right. We cannot make any
 guarantees. Time, review and feedback are the only things that can
 prove the security of any cryptographic product. If you wish to review
-tinc or give us feedback, you are strongly encouraged to do so.
+tinc or give us feedback, you are stronly encouraged to do so.
@c ==================================================================
@ -2500,6 +2500,13 @@ For IPv6 addresses:
@tab @code{netsh interface ipv6 add address} @var{interface} @code{static} @var{address}/@var{prefixlength}
@end multitable
 On some platforms, when running tinc in switch mode, the VPN interface must be set to tap mode with an ifconfig command:
@multitable {Darwin (Mac OS X)} {ifconfig route add -bla network address netmask netmask prefixlength interface}
@item OpenBSD
@tab @code{ifconfig} @var{interface} @code{link0}
@end multitable
 On Linux, it is possible to create a persistent tun/tap interface which will
 continue to exist even if tinc quit, although this is normally not required.
 It can be useful to set up a tun/tap interface owned by a non-root user, so
--- a/doc/tincinclude.texi
+++ b/doc/tincinclude.texi
@ -1,5 +1,5 @@
-@set VERSION 1.0.36
+@set VERSION 1.0.34
@set PACKAGE tinc
@set sysconfdir /etc
@set localstatedir /var
-@set runstatedir /run
+@set runstatedir /var/run
--- a/49
+++ b/49
@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
-scriptversion=2018-03-11.20; # UTC
+scriptversion=2014-09-12.12; # UTC
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@ -271,18 +271,15 @@ do
    fi
    dst=$dst_arg
-    # If destination is a directory, append the input filename.
+    # If destination is a directory, append the input filename; won't work
    # if double slashes aren't ignored.
    if test -d "$dst"; then
      if test "$is_target_a_directory" = never; then
        echo "$0: $dst_arg: Is a directory" >&2
        exit 1
      fi
      dstdir=$dst
-      dstbase=`basename "$src"`
+      dst=$dstdir/`basename "$src"`
      case $dst in
 	*/) dst=$dst$dstbase;;
 	*)  dst=$dst/$dstbase;;
      esac
      dstdir_status=0
    else
      dstdir=`dirname "$dst"`
@ -291,11 +288,6 @@ do
    fi
  fi
  case $dstdir in
    */) dstdirslash=$dstdir;;
    *)  dstdirslash=$dstdir/;;
  esac
  obsolete_mkdir_used=false
  if test $dstdir_status != 0; then
@ -332,16 +324,14 @@ do
            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
            ;;
          *)
-            # Note that $RANDOM variable is not portable (e.g. dash);  Use it
+            # $RANDOM is not portable (e.g. dash);  use it when possible to
-            # here however when possible just to lower collision chance.
+            # lower collision chance
            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0
-            # Because "mkdir -p" follows existing symlinks and we likely work
+            # As "mkdir -p" follows symlinks and we work in /tmp possibly;  so
-            # directly in world-writeable /tmp, make sure that the '$tmpdir'
+            # create the $tmpdir first (and fail if unsuccessful) to make sure
-            # directory is successfully created first before we actually test
+            # that nobody tries to guess the $tmpdir name.
            # 'mkdir -p' feature.
            if (umask $mkdir_umask &&
                $mkdirprog $mkdir_mode "$tmpdir" &&
                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
@ -444,25 +434,14 @@ do
  else
    # Make a couple of temp file names in the proper directory.
-    dsttmp=${dstdirslash}_inst.$$_
+    dsttmp=$dstdir/_inst.$$_
-    rmtmp=${dstdirslash}_rm.$$_
+    rmtmp=$dstdir/_rm.$$_
    # Trap to clean up those temp files at exit.
    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
    # Copy the file name to the temp name.
-    (umask $cp_umask &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
     { test -z "$stripcmd" || {
 	 # Create $dsttmp read-write so that cp doesn't create it read-only,
 	 # which would cause strip to fail.
 	 if test -z "$doit"; then
 	   : >"$dsttmp" # No need to fork-exec 'touch'.
 	 else
 	   $doit touch "$dsttmp"
 	 fi
       }
     } &&
     $doit_exec $cpprog "$src" "$dsttmp") &&
    # and set any options; do chmod last to preserve setuid bits.
    #
@ -521,9 +500,9 @@ do
 done
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:
--- a/16
+++ b/16
@ -1,9 +1,9 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 # This program is free software; you can redistribute it and/or modify
@ -17,7 +17,7 @@ scriptversion=2018-03-07.03; # UTC
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@ -101,9 +101,9 @@ else
  exit $st
 fi
-perl_URL=https://www.perl.org/
+perl_URL=http://www.perl.org/
-flex_URL=https://github.com/westes/flex
+flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=https://www.gnu.org/software
+gnu_software_URL=http://www.gnu.org/software
 program_details ()
 {
@ -207,9 +207,9 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \
 exit $st
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:
--- a/src/Makefile.in
+++ b/src/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -178,29 +178,7 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = 
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__maybe_remake_depfiles = depfiles
+am__depfiles_maybe = depfiles
 am__depfiles_remade = ./$(DEPDIR)/avl_tree.Po ./$(DEPDIR)/conf.Po \
 	./$(DEPDIR)/connection.Po ./$(DEPDIR)/dropin.Po \
 	./$(DEPDIR)/dummy_device.Po ./$(DEPDIR)/edge.Po \
 	./$(DEPDIR)/event.Po ./$(DEPDIR)/fake-getaddrinfo.Po \
 	./$(DEPDIR)/fake-getnameinfo.Po ./$(DEPDIR)/getopt.Po \
 	./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/graph.Po \
 	./$(DEPDIR)/list.Po ./$(DEPDIR)/logger.Po ./$(DEPDIR)/meta.Po \
 	./$(DEPDIR)/multicast_device.Po ./$(DEPDIR)/net.Po \
 	./$(DEPDIR)/net_packet.Po ./$(DEPDIR)/net_setup.Po \
 	./$(DEPDIR)/net_socket.Po ./$(DEPDIR)/netutl.Po \
 	./$(DEPDIR)/node.Po ./$(DEPDIR)/pidfile.Po \
 	./$(DEPDIR)/process.Po ./$(DEPDIR)/protocol.Po \
 	./$(DEPDIR)/protocol_auth.Po ./$(DEPDIR)/protocol_edge.Po \
 	./$(DEPDIR)/protocol_key.Po ./$(DEPDIR)/protocol_misc.Po \
 	./$(DEPDIR)/protocol_subnet.Po ./$(DEPDIR)/proxy.Po \
 	./$(DEPDIR)/raw_socket_device.Po ./$(DEPDIR)/route.Po \
 	./$(DEPDIR)/subnet.Po ./$(DEPDIR)/tincd.Po \
 	./$(DEPDIR)/uml_device.Po ./$(DEPDIR)/utils.Po \
 	./$(DEPDIR)/vde_device.Po bsd/$(DEPDIR)/device.Po \
 	bsd/$(DEPDIR)/tunemu.Po cygwin/$(DEPDIR)/device.Po \
 	linux/$(DEPDIR)/device.Po mingw/$(DEPDIR)/device.Po \
 	solaris/$(DEPDIR)/device.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -376,8 +354,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -504,56 +482,50 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl_tree.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl_tree.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conf.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connection.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connection.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dropin.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dropin.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy_device.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy_device.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edge.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edge.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/event.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fake-getaddrinfo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fake-getaddrinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fake-getnameinfo.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fake-getnameinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graph.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multicast_device.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multicast_device.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net_packet.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net_packet.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net_setup.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net_setup.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net_socket.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net_socket.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netutl.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netutl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pidfile.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pidfile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/process.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protocol.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protocol.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protocol_auth.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protocol_auth.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protocol_edge.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protocol_edge.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protocol_key.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protocol_key.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protocol_misc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protocol_misc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protocol_subnet.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/protocol_subnet.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxy.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/raw_socket_device.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/raw_socket_device.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/route.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/route.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subnet.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/subnet.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tincd.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tincd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uml_device.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uml_device.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vde_device.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vde_device.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@bsd/$(DEPDIR)/device.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@bsd/$(DEPDIR)/device.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@bsd/$(DEPDIR)/tunemu.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@bsd/$(DEPDIR)/tunemu.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@cygwin/$(DEPDIR)/device.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@cygwin/$(DEPDIR)/device.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@linux/$(DEPDIR)/device.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@linux/$(DEPDIR)/device.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@mingw/$(DEPDIR)/device.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@mingw/$(DEPDIR)/device.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@solaris/$(DEPDIR)/device.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@solaris/$(DEPDIR)/device.Po@am__quote@
 $(am__depfiles_remade):
 	@$(MKDIR_P) $(@D)
 	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
 am--depfiles: $(am__depfiles_remade)
 .c.o:
@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@ -623,10 +595,7 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-distdir: $(BUILT_SOURCES)
+distdir: $(DISTFILES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@ -708,50 +677,7 @@ clean: clean-am
 clean-am: clean-generic clean-sbinPROGRAMS mostlyclean-am
 distclean: distclean-am
-		-rm -f ./$(DEPDIR)/avl_tree.Po
+	-rm -rf ./$(DEPDIR) bsd/$(DEPDIR) cygwin/$(DEPDIR) linux/$(DEPDIR) mingw/$(DEPDIR) solaris/$(DEPDIR)
 	-rm -f ./$(DEPDIR)/conf.Po
 	-rm -f ./$(DEPDIR)/connection.Po
 	-rm -f ./$(DEPDIR)/dropin.Po
 	-rm -f ./$(DEPDIR)/dummy_device.Po
 	-rm -f ./$(DEPDIR)/edge.Po
 	-rm -f ./$(DEPDIR)/event.Po
 	-rm -f ./$(DEPDIR)/fake-getaddrinfo.Po
 	-rm -f ./$(DEPDIR)/fake-getnameinfo.Po
 	-rm -f ./$(DEPDIR)/getopt.Po
 	-rm -f ./$(DEPDIR)/getopt1.Po
 	-rm -f ./$(DEPDIR)/graph.Po
 	-rm -f ./$(DEPDIR)/list.Po
 	-rm -f ./$(DEPDIR)/logger.Po
 	-rm -f ./$(DEPDIR)/meta.Po
 	-rm -f ./$(DEPDIR)/multicast_device.Po
 	-rm -f ./$(DEPDIR)/net.Po
 	-rm -f ./$(DEPDIR)/net_packet.Po
 	-rm -f ./$(DEPDIR)/net_setup.Po
 	-rm -f ./$(DEPDIR)/net_socket.Po
 	-rm -f ./$(DEPDIR)/netutl.Po
 	-rm -f ./$(DEPDIR)/node.Po
 	-rm -f ./$(DEPDIR)/pidfile.Po
 	-rm -f ./$(DEPDIR)/process.Po
 	-rm -f ./$(DEPDIR)/protocol.Po
 	-rm -f ./$(DEPDIR)/protocol_auth.Po
 	-rm -f ./$(DEPDIR)/protocol_edge.Po
 	-rm -f ./$(DEPDIR)/protocol_key.Po
 	-rm -f ./$(DEPDIR)/protocol_misc.Po
 	-rm -f ./$(DEPDIR)/protocol_subnet.Po
 	-rm -f ./$(DEPDIR)/proxy.Po
 	-rm -f ./$(DEPDIR)/raw_socket_device.Po
 	-rm -f ./$(DEPDIR)/route.Po
 	-rm -f ./$(DEPDIR)/subnet.Po
 	-rm -f ./$(DEPDIR)/tincd.Po
 	-rm -f ./$(DEPDIR)/uml_device.Po
 	-rm -f ./$(DEPDIR)/utils.Po
 	-rm -f ./$(DEPDIR)/vde_device.Po
 	-rm -f bsd/$(DEPDIR)/device.Po
 	-rm -f bsd/$(DEPDIR)/tunemu.Po
 	-rm -f cygwin/$(DEPDIR)/device.Po
 	-rm -f linux/$(DEPDIR)/device.Po
 	-rm -f mingw/$(DEPDIR)/device.Po
 	-rm -f solaris/$(DEPDIR)/device.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@ -797,50 +723,7 @@ install-ps-am:
 installcheck-am: installcheck-sbinPROGRAMS
 maintainer-clean: maintainer-clean-am
-		-rm -f ./$(DEPDIR)/avl_tree.Po
+	-rm -rf ./$(DEPDIR) bsd/$(DEPDIR) cygwin/$(DEPDIR) linux/$(DEPDIR) mingw/$(DEPDIR) solaris/$(DEPDIR)
 	-rm -f ./$(DEPDIR)/conf.Po
 	-rm -f ./$(DEPDIR)/connection.Po
 	-rm -f ./$(DEPDIR)/dropin.Po
 	-rm -f ./$(DEPDIR)/dummy_device.Po
 	-rm -f ./$(DEPDIR)/edge.Po
 	-rm -f ./$(DEPDIR)/event.Po
 	-rm -f ./$(DEPDIR)/fake-getaddrinfo.Po
 	-rm -f ./$(DEPDIR)/fake-getnameinfo.Po
 	-rm -f ./$(DEPDIR)/getopt.Po
 	-rm -f ./$(DEPDIR)/getopt1.Po
 	-rm -f ./$(DEPDIR)/graph.Po
 	-rm -f ./$(DEPDIR)/list.Po
 	-rm -f ./$(DEPDIR)/logger.Po
 	-rm -f ./$(DEPDIR)/meta.Po
 	-rm -f ./$(DEPDIR)/multicast_device.Po
 	-rm -f ./$(DEPDIR)/net.Po
 	-rm -f ./$(DEPDIR)/net_packet.Po
 	-rm -f ./$(DEPDIR)/net_setup.Po
 	-rm -f ./$(DEPDIR)/net_socket.Po
 	-rm -f ./$(DEPDIR)/netutl.Po
 	-rm -f ./$(DEPDIR)/node.Po
 	-rm -f ./$(DEPDIR)/pidfile.Po
 	-rm -f ./$(DEPDIR)/process.Po
 	-rm -f ./$(DEPDIR)/protocol.Po
 	-rm -f ./$(DEPDIR)/protocol_auth.Po
 	-rm -f ./$(DEPDIR)/protocol_edge.Po
 	-rm -f ./$(DEPDIR)/protocol_key.Po
 	-rm -f ./$(DEPDIR)/protocol_misc.Po
 	-rm -f ./$(DEPDIR)/protocol_subnet.Po
 	-rm -f ./$(DEPDIR)/proxy.Po
 	-rm -f ./$(DEPDIR)/raw_socket_device.Po
 	-rm -f ./$(DEPDIR)/route.Po
 	-rm -f ./$(DEPDIR)/subnet.Po
 	-rm -f ./$(DEPDIR)/tincd.Po
 	-rm -f ./$(DEPDIR)/uml_device.Po
 	-rm -f ./$(DEPDIR)/utils.Po
 	-rm -f ./$(DEPDIR)/vde_device.Po
 	-rm -f bsd/$(DEPDIR)/device.Po
 	-rm -f bsd/$(DEPDIR)/tunemu.Po
 	-rm -f cygwin/$(DEPDIR)/device.Po
 	-rm -f linux/$(DEPDIR)/device.Po
 	-rm -f mingw/$(DEPDIR)/device.Po
 	-rm -f solaris/$(DEPDIR)/device.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
@ -860,19 +743,19 @@ uninstall-am: uninstall-sbinPROGRAMS
 .MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-generic clean-sbinPROGRAMS cscopelist-am ctags ctags-am \
+	clean-sbinPROGRAMS cscopelist-am ctags ctags-am distclean \
-	distclean distclean-compile distclean-generic distclean-tags \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
-	distdir dvi dvi-am html html-am info info-am install \
+	dvi-am html html-am info info-am install install-am \
-	install-am install-data install-data-am install-dvi \
+	install-data install-data-am install-dvi install-dvi-am \
-	install-dvi-am install-exec install-exec-am install-html \
+	install-exec install-exec-am install-html install-html-am \
-	install-html-am install-info install-info-am install-man \
+	install-info install-info-am install-man install-pdf \
-	install-pdf install-pdf-am install-ps install-ps-am \
+	install-pdf-am install-ps install-ps-am install-sbinPROGRAMS \
-	install-sbinPROGRAMS install-strip installcheck \
+	install-strip installcheck installcheck-am \
-	installcheck-am installcheck-sbinPROGRAMS installdirs \
+	installcheck-sbinPROGRAMS installdirs maintainer-clean \
-	maintainer-clean maintainer-clean-generic mostlyclean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
-	tags tags-am uninstall uninstall-am uninstall-sbinPROGRAMS
+	uninstall-am uninstall-sbinPROGRAMS
 .PRECIOUS: Makefile
--- a/src/conf.c
+++ b/src/conf.c
@ -81,9 +81,18 @@ config_t *new_config(void) {
 }
 void free_config(config_t *cfg) {
-	free(cfg->variable);
+	if(cfg->variable) {
-	free(cfg->value);
+		free(cfg->variable);
-	free(cfg->file);
+	}
 	if(cfg->value) {
 		free(cfg->value);
 	}
 	if(cfg->file) {
 		free(cfg->file);
 	}
 	free(cfg);
 }
@ -195,7 +204,7 @@ bool get_config_address(const config_t *cfg, struct addrinfo **result) {
 }
 bool get_config_subnet(const config_t *cfg, subnet_t **result) {
-	subnet_t subnet = {0};
+	subnet_t subnet = {};
 	if(!cfg) {
 		return false;
@ -423,11 +432,7 @@ bool read_server_config(void) {
 				// And we try to read the ones that end with ".conf"
 				if(l > 5 && !strcmp(".conf", & ep->d_name[ l - 5 ])) {
-					if((size_t)snprintf(fname, sizeof(fname), "%s/%s", dname, ep->d_name) >= sizeof(fname)) {
+					snprintf(fname, sizeof(fname), "%s/%s", dname, ep->d_name);
 						logger(LOG_ERR, "Pathname too long: %s/%s", dname, ep->d_name);
 						return false;
 					}
 					x = read_config_file(config_tree, fname);
 				}
 			}
@ -467,14 +472,9 @@ static void disable_old_keys(const char *filename) {
 		return;
 	}
-	int len = snprintf(tmpfile, sizeof(tmpfile), "%s.tmp", filename);
+	snprintf(tmpfile, sizeof(tmpfile), "%s.tmp", filename);
-	if(len < 0 || len >= PATH_MAX) {
+	w = fopen(tmpfile, "w");
 		fprintf(stderr, "Pathname too long: %s.tmp\n", filename);
 		w = NULL;
 	} else {
 		w = fopen(tmpfile, "w");
 	}
 	while(fgets(buf, sizeof(buf), r)) {
 		if(!strncmp(buf, "-----BEGIN RSA", 14)) {
@ -573,12 +573,7 @@ FILE *ask_and_open(const char *filename, const char *what) {
 #endif
 		/* The directory is a relative path or a filename. */
 		getcwd(directory, sizeof(directory));
-
+		snprintf(abspath, sizeof(abspath), "%s/%s", directory, fn);
 		if((size_t)snprintf(abspath, sizeof(abspath), "%s/%s", directory, fn) >= sizeof(abspath)) {
 			fprintf(stderr, "Pathname too long: %s/%s\n", directory, fn);
 			return NULL;
 		}
 		fn = abspath;
 	}
--- a/src/connection.c
+++ b/src/connection.c
@ -96,13 +96,13 @@ void free_connection_partially(connection_t *c) {
 	c->outbudget = 0;
 	if(c->inctx) {
-		EVP_CIPHER_CTX_reset(c->inctx);
+		EVP_CIPHER_CTX_cleanup(c->inctx);
 		free(c->inctx);
 		c->inctx = NULL;
 	}
 	if(c->outctx) {
-		EVP_CIPHER_CTX_reset(c->outctx);
+		EVP_CIPHER_CTX_cleanup(c->outctx);
 		free(c->outctx);
 		c->outctx = NULL;
 	}
--- a/src/connection.h
+++ b/src/connection.h
@ -24,10 +24,6 @@
 #include <openssl/rsa.h>
 #include <openssl/evp.h>
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 #define EVP_CIPHER_CTX_reset(c) EVP_CIPHER_CTX_cleanup(c)
 #endif
 #include "avl_tree.h"
 #define OPTION_INDIRECT         0x0001
@ -46,8 +42,7 @@ typedef struct connection_status_t {
 	unsigned int decryptin: 1;      /* 1 if we have to decrypt incoming traffic */
 	unsigned int mst: 1;            /* 1 if this connection is part of a minimum spanning tree */
 	unsigned int proxy_passed: 1;   /* 1 if we are connecting via a proxy and we have finished talking with it */
-	unsigned int tarpit: 1;         /* 1 if the connection should be added to the tarpit */
+	unsigned int unused: 22;
 	unsigned int unused: 21;
 } connection_status_t;
 #include "edge.h"
--- a/src/dummy_device.c
+++ b/src/dummy_device.c
@ -37,8 +37,6 @@ static bool setup_device(void) {
 }
 static void close_device(void) {
 	free(device);
 	free(iface);
 }
 static bool read_packet(vpn_packet_t *packet) {
--- a/src/fake-getaddrinfo.c
+++ b/src/fake-getaddrinfo.c
@ -2,10 +2,10 @@
 * fake library for ssh
 *
 * This file includes getaddrinfo(), freeaddrinfo() and gai_strerror().
- * These functions are defined in rfc2133.
+ * These funtions are defined in rfc2133.
 *
 * But these functions are not implemented correctly. The minimum subset
- * is implemented for ssh use only. For example, this routine assumes
+ * is implemented for ssh use only. For exapmle, this routine assumes
 * that ai_family is AF_INET. Don't use it for another purpose.
 */
--- a/src/fake-getnameinfo.c
+++ b/src/fake-getnameinfo.c
@ -2,10 +2,10 @@
 * fake library for ssh
 *
 * This file includes getnameinfo().
- * These functions are defined in rfc2133.
+ * These funtions are defined in rfc2133.
 *
 * But these functions are not implemented correctly. The minimum subset
- * is implemented for ssh use only. For example, this routine assumes
+ * is implemented for ssh use only. For exapmle, this routine assumes
 * that ai_family is AF_INET. Don't use it for another purpose.
 */
--- a/src/getopt.c
+++ b/src/getopt.c
@ -83,7 +83,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #endif
 #endif
-#if defined (WIN32) && !defined (__CYGWIN32__)
+#if defined (WIN32) && !defined (__CYGWIN32__32)
 /* It's not Unix, really.  See?  Capital letters.  */
 #include <windows.h>
 #define getpid() GetCurrentProcessId()
--- a/src/graph.c
+++ b/src/graph.c
@ -274,9 +274,9 @@ static void sssp_bfs(void) {
 				n->mtuevent = NULL;
 			}
-			xasprintf(&envp[0], "NETNAME=%s", netname ? netname : "");
+			xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
-			xasprintf(&envp[1], "DEVICE=%s", device ? device : "");
+			xasprintf(&envp[1], "DEVICE=%s", device ? : "");
-			xasprintf(&envp[2], "INTERFACE=%s", iface ? iface : "");
+			xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
 			xasprintf(&envp[3], "NODE=%s", n->name);
 			sockaddr2str(&n->address, &address, &port);
 			xasprintf(&envp[4], "REMOTEADDRESS=%s", address);
@ -360,13 +360,13 @@ void dump_graph(void) {
 	/* dump all nodes first */
 	for(node = node_tree->head; node; node = node->next) {
 		n = node->data;
-		fprintf(file, "	\"%s\" [label = \"%s\"];\n", n->name, n->name);
+		fprintf(file, "	%s [label = \"%s\"];\n", n->name, n->name);
 	}
 	/* now dump all edges */
 	for(node = edge_weight_tree->head; node; node = node->next) {
 		e = node->data;
-		fprintf(file, "	\"%s\" -> \"%s\";\n", e->from->name, e->to->name);
+		fprintf(file, "	%s -> %s;\n", e->from->name, e->to->name);
 	}
 	fprintf(file, "}\n");
--- a/src/net.c
+++ b/src/net.c
@ -180,22 +180,6 @@ static int build_fdset(fd_set *readset, fd_set *writeset) {
 	return max;
 }
 /* Put a misbehaving connection in the tarpit */
 void tarpit(int fd) {
 	static int pits[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
 	static int next_pit = 0;
 	if(pits[next_pit] != -1) {
 		closesocket(pits[next_pit]);
 	}
 	pits[next_pit++] = fd;
 	if(next_pit >= (int)(sizeof pits / sizeof pits[0])) {
 		next_pit = 0;
 	}
 }
 /*
  Terminate a connection:
  - Close the socket
@ -219,11 +203,7 @@ void terminate_connection(connection_t *c, bool report) {
 	}
 	if(c->socket) {
-		if(c->status.tarpit) {
+		closesocket(c->socket);
 			tarpit(c->socket);
 		} else {
 			closesocket(c->socket);
 		}
 	}
 	if(c->edge) {
@ -319,7 +299,6 @@ static void check_dead_connections(void) {
 					closesocket(c->socket);
 					do_outgoing_connection(c);
 				} else {
 					c->status.tarpit = true;
 					terminate_connection(c, false);
 				}
 			}
@ -401,7 +380,6 @@ static void check_network_activity(fd_set *readset, fd_set *writeset) {
 		if(FD_ISSET(c->socket, readset)) {
 			if(!receive_meta(c)) {
 				c->status.tarpit = true;
 				terminate_connection(c, c->status.active);
 				continue;
 			}
--- a/src/net.h
+++ b/src/net.h
@ -150,7 +150,6 @@ extern void flush_queue(struct node_t *n);
 extern bool read_rsa_public_key(struct connection_t *c);
 extern void send_mtu_probe(struct node_t *n);
 extern void load_all_subnets(void);
 extern void tarpit(int fd);
 #ifndef HAVE_MINGW
 #define closesocket(s) close(s)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@ -27,7 +27,6 @@
 #include <openssl/rand.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/bn.h>
 #include "avl_tree.h"
 #include "conf.h"
@ -240,7 +239,7 @@ static bool read_rsa_private_key(void) {
 		return false;
 	}
-#if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
+#if !defined(HAVE_MINGW) && !defined(HAVE___CYGWIN32__)
 	struct stat s;
 	if(!fstat(fileno(fp), &s)) {
@ -389,8 +388,8 @@ static bool setup_myself(void) {
 	char *address = NULL;
 	char *proxy = NULL;
 	char *space;
-	char *envp[5] = {0};
+	char *envp[5] = {};
-	struct addrinfo *ai, *aip, hint = {0};
+	struct addrinfo *ai, *aip, hint = {};
 	bool choice;
 	int i, err;
 	int replaywin_int;
@ -853,15 +852,15 @@ static bool setup_myself(void) {
 	}
 	/* Run tinc-up script to further initialize the tap interface */
-	xasprintf(&envp[0], "NETNAME=%s", netname ? netname : "");
+	xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
-	xasprintf(&envp[1], "DEVICE=%s", device ? device : "");
+	xasprintf(&envp[1], "DEVICE=%s", device ? : "");
-	xasprintf(&envp[2], "INTERFACE=%s", iface ? iface : "");
+	xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
 	xasprintf(&envp[3], "NAME=%s", myself->name);
 #ifdef HAVE_MINGW
 	Sleep(1000);
 #endif
-#ifdef HAVE_CYGWIN
+#ifdef HAVE___CYGWIN32__
 	sleep(1);
 #endif
 	execute_script("tinc-up", envp);
@ -1069,7 +1068,7 @@ bool setup_network(void) {
 void close_network_connections(void) {
 	avl_node_t *node, *next;
 	connection_t *c;
-	char *envp[5] = {0};
+	char *envp[5] = {};
 	int i;
 	for(node = connection_tree->head; node; node = next) {
@ -1100,9 +1099,9 @@ void close_network_connections(void) {
 		close(listen_socket[i].udp);
 	}
-	xasprintf(&envp[0], "NETNAME=%s", netname ? netname : "");
+	xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
-	xasprintf(&envp[1], "DEVICE=%s", device ? device : "");
+	xasprintf(&envp[1], "DEVICE=%s", device ? : "");
-	xasprintf(&envp[2], "INTERFACE=%s", iface ? iface : "");
+	xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
 	xasprintf(&envp[3], "NAME=%s", myself->name);
 	exit_requests();
--- a/src/net_socket.c
+++ b/src/net_socket.c
@ -639,9 +639,6 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
  new connection
 */
 bool handle_new_meta_connection(int sock) {
 	static const int max_accept_burst = 10;
 	static int last_accept_burst;
 	static int last_accept_time;
 	connection_t *c;
 	sockaddr_t sa;
 	int fd;
@ -654,22 +651,6 @@ bool handle_new_meta_connection(int sock) {
 		return false;
 	}
 	if(last_accept_time == now) {
 		last_accept_burst++;
 		if(last_accept_burst >= max_accept_burst) {
 			if(last_accept_burst == max_accept_burst) {
 				ifdebug(CONNECTIONS) logger(LOG_WARNING, "Throttling incoming connections");
 			}
 			tarpit(fd);
 			return false;
 		}
 	} else {
 		last_accept_burst = 0;
 		last_accept_time = now;
 	}
 	sockaddrunmap(&sa);
 	c = new_connection();
@ -691,6 +672,7 @@ bool handle_new_meta_connection(int sock) {
 	connection_add(c);
 	c->allow_request = ID;
 	send_id(c);
 	return true;
 }
--- a/src/netutl.c
+++ b/src/netutl.c
@ -33,7 +33,7 @@ bool hostnames = false;
  Return NULL on failure.
 */
 struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype) {
-	struct addrinfo *ai = NULL, hint = {0};
+	struct addrinfo *ai = NULL, hint = {};
 	int err;
 	hint.ai_family = addressfamily;
@ -55,7 +55,7 @@ struct addrinfo *str2addrinfo(const char *address, const char *service, int sock
 }
 sockaddr_t str2sockaddr(const char *address, const char *port) {
-	struct addrinfo *ai = NULL, hint = {0};
+	struct addrinfo *ai = NULL, hint = {};
 	sockaddr_t result;
 	int err;
--- a/src/node.c
+++ b/src/node.c
@ -140,7 +140,7 @@ void node_del(node_t *n) {
 }
 node_t *lookup_node(char *name) {
-	node_t n = {0};
+	node_t n = {};
 	n.name = name;
@ -148,7 +148,7 @@ node_t *lookup_node(char *name) {
 }
 node_t *lookup_node_udp(const sockaddr_t *sa) {
-	node_t n = {0};
+	node_t n = {};
 	n.address = *sa;
 	n.name = NULL;
--- a/src/protocol.c
+++ b/src/protocol.c
@ -193,7 +193,7 @@ void exit_requests(void) {
 }
 bool seen_request(char *request) {
-	past_request_t *new, p = {0};
+	past_request_t *new, p = {};
 	p.request = request;
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@ -60,7 +60,7 @@ bool id_h(connection_t *c) {
 	/* Check if identity is a valid name */
-	if(!check_id(name) || !strcmp(name, myself->name)) {
+	if(!check_id(name)) {
 		logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ID", c->name,
 		       c->hostname, "invalid name");
 		return false;
@ -96,11 +96,6 @@ bool id_h(connection_t *c) {
 		}
 		c->allow_request = ACK;
 		if(!c->outgoing) {
 			send_id(c);
 		}
 		return send_ack(c);
 	}
@ -120,10 +115,6 @@ bool id_h(connection_t *c) {
 	c->allow_request = METAKEY;
 	if(!c->outgoing) {
 		send_id(c);
 	}
 	return send_metakey(c);
 }
@ -310,8 +301,7 @@ bool metakey_h(connection_t *c) {
 		c->inbudget = byte_budget(c->incipher);
 		c->status.decryptin = true;
 	} else {
-		logger(LOG_ERR, "%s (%s) uses null cipher!", c->name, c->hostname);
+		c->incipher = NULL;
 		return false;
 	}
 	c->inmaclength = maclength;
@ -329,8 +319,7 @@ bool metakey_h(connection_t *c) {
 			return false;
 		}
 	} else {
-		logger(LOG_ERR, "%s (%s) uses null digest!", c->name, c->hostname);
+		c->indigest = NULL;
 		return false;
 	}
 	c->incompression = compression;
@ -404,11 +393,7 @@ bool challenge_h(connection_t *c) {
 	/* Rest is done by send_chal_reply() */
-	if(c->outgoing) {
+	return send_chal_reply(c);
 		return send_chal_reply(c);
 	} else {
 		return true;
 	}
 }
 bool send_chal_reply(connection_t *c) {
@ -510,10 +495,6 @@ bool chal_reply_h(connection_t *c) {
 	c->allow_request = ACK;
 	if(!c->outgoing) {
 		send_chal_reply(c);
 	}
 	return send_ack(c);
 }
--- a/src/protocol_edge.c
+++ b/src/protocol_edge.c
@ -70,7 +70,7 @@ bool add_edge_h(connection_t *c) {
 	/* Check if names are valid */
-	if(!check_id(from_name) || !check_id(to_name) || !strcmp(from_name, to_name)) {
+	if(!check_id(from_name) || !check_id(to_name)) {
 		logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ADD_EDGE", c->name,
 		       c->hostname, "invalid name");
 		return false;
@ -197,7 +197,7 @@ bool del_edge_h(connection_t *c) {
 	/* Check if names are valid */
-	if(!check_id(from_name) || !check_id(to_name) || !strcmp(from_name, to_name)) {
+	if(!check_id(from_name) || !check_id(to_name)) {
 		logger(LOG_ERR, "Got bad %s from %s (%s): %s", "DEL_EDGE", c->name,
 		       c->hostname, "invalid name");
 		return false;
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@ -286,11 +286,6 @@ bool ans_key_h(connection_t *c) {
 			return true;
 		}
 	} else {
 		if(from->outkeylength != 1) {
 			logger(LOG_ERR, "Node %s (%s) uses wrong keylength!", from->name, from->hostname);
 			return true;
 		}
 		from->outcipher = NULL;
 	}
--- a/src/protocol_subnet.c
+++ b/src/protocol_subnet.c
@ -46,7 +46,7 @@ bool add_subnet_h(connection_t *c) {
 	char subnetstr[MAX_STRING_SIZE];
 	char name[MAX_STRING_SIZE];
 	node_t *owner;
-	subnet_t s = {0}, *new, *old;
+	subnet_t s = {}, *new, *old;
 	if(sscanf(c->buffer, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
 		logger(LOG_ERR, "Got bad %s from %s (%s)", "ADD_SUBNET", c->name,
@ -160,7 +160,7 @@ bool del_subnet_h(connection_t *c) {
 	char subnetstr[MAX_STRING_SIZE];
 	char name[MAX_STRING_SIZE];
 	node_t *owner;
-	subnet_t s = {0}, *find;
+	subnet_t s = {}, *find;
 	if(sscanf(c->buffer, "%*d %*x " MAX_STRING " " MAX_STRING, name, subnetstr) != 2) {
 		logger(LOG_ERR, "Got bad %s from %s (%s)", "DEL_SUBNET", c->name,
--- a/src/route.c
+++ b/src/route.c
@ -116,8 +116,8 @@ static void swap_mac_addresses(vpn_packet_t *packet) {
 /* RFC 792 */
 static void route_ipv4_unreachable(node_t *source, vpn_packet_t *packet, length_t ether_size, uint8_t type, uint8_t code) {
-	struct ip ip = {0};
+	struct ip ip = {};
-	struct icmp icmp = {0};
+	struct icmp icmp = {};
 	struct in_addr ip_src;
 	struct in_addr ip_dst;
@ -218,7 +218,7 @@ static void route_ipv4_unreachable(node_t *source, vpn_packet_t *packet, length_
 static void route_ipv6_unreachable(node_t *source, vpn_packet_t *packet, length_t ether_size, uint8_t type, uint8_t code) {
 	struct ip6_hdr ip6;
-	struct icmp6_hdr icmp6 = {0};
+	struct icmp6_hdr icmp6 = {};
 	uint16_t checksum;
 	struct {
@ -581,7 +581,7 @@ static void fragment_ipv4_packet(node_t *dest, vpn_packet_t *packet, length_t et
 	ifdebug(TRAFFIC) logger(LOG_INFO, "Fragmenting packet of %d bytes to %s (%s)", packet->len, dest->name, dest->hostname);
 	offset = packet->data + ether_size + ip_size;
-	maxlen = (MAX(dest->mtu, 590) - ether_size - ip_size) & ~0x7;
+	maxlen = (dest->mtu - ether_size - ip_size) & ~0x7;
 	ip_off = ntohs(ip.ip_off);
 	origf = ip_off & ~IP_OFFMASK;
 	ip_off &= IP_OFFMASK;
@ -632,13 +632,11 @@ static void route_ipv4_unicast(node_t *source, vpn_packet_t *packet) {
 	}
 	if(!subnet->owner->status.reachable) {
-		route_ipv4_unreachable(source, packet, ether_size, ICMP_DEST_UNREACH, ICMP_NET_UNREACH);
+		return route_ipv4_unreachable(source, packet, ether_size, ICMP_DEST_UNREACH, ICMP_NET_UNREACH);
 		return;
 	}
 	if(forwarding_mode == FMODE_OFF && source != myself && subnet->owner != myself) {
-		route_ipv4_unreachable(source, packet, ether_size, ICMP_DEST_UNREACH, ICMP_NET_ANO);
+		return route_ipv4_unreachable(source, packet, ether_size, ICMP_DEST_UNREACH, ICMP_NET_ANO);
 		return;
 	}
 	if(decrement_ttl && source != myself && subnet->owner != myself)
@ -658,8 +656,7 @@ static void route_ipv4_unicast(node_t *source, vpn_packet_t *packet) {
 	}
 	if(directonly && subnet->owner != via) {
-		route_ipv4_unreachable(source, packet, ether_size, ICMP_DEST_UNREACH, ICMP_NET_ANO);
+		return route_ipv4_unreachable(source, packet, ether_size, ICMP_DEST_UNREACH, ICMP_NET_ANO);
 		return;
 	}
 	if(via && packet->len > MAX(via->mtu, 590) && via != myself) {
@ -726,20 +723,17 @@ static void route_ipv6_unicast(node_t *source, vpn_packet_t *packet) {
 	}
 	if(!subnet->owner->status.reachable) {
-		route_ipv6_unreachable(source, packet, ether_size, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOROUTE);
+		return route_ipv6_unreachable(source, packet, ether_size, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOROUTE);
 		return;
 	}
 	if(forwarding_mode == FMODE_OFF && source != myself && subnet->owner != myself) {
-		route_ipv6_unreachable(source, packet, ether_size, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADMIN);
+		return route_ipv6_unreachable(source, packet, ether_size, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADMIN);
 		return;
 	}
-	if(decrement_ttl && source != myself && subnet->owner != myself) {
+	if(decrement_ttl && source != myself && subnet->owner != myself)
 		if(!do_decrement_ttl(source, packet)) {
 			return;
 		}
 	}
 	if(priorityinheritance) {
 		packet->priority = ((packet->data[14] & 0x0f) << 4) | (packet->data[15] >> 4);
@ -753,8 +747,7 @@ static void route_ipv6_unicast(node_t *source, vpn_packet_t *packet) {
 	}
 	if(directonly && subnet->owner != via) {
-		route_ipv6_unreachable(source, packet, ether_size, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADMIN);
+		return route_ipv6_unreachable(source, packet, ether_size, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADMIN);
 		return;
 	}
 	if(via && packet->len > MAX(via->mtu, 1294) && via != myself) {
@ -882,7 +875,7 @@ static void route_neighborsol(node_t *source, vpn_packet_t *packet) {
 	memcpy(packet->data, packet->data + ETH_ALEN, ETH_ALEN);        /* copy destination address */
 	packet->data[ETH_ALEN * 2 - 1] ^= 0xFF; /* mangle source address so it looks like it's not from us */
-	ip6.ip6_dst = ip6.ip6_src;                      /* swap destination and source protocol address */
+	ip6.ip6_dst = ip6.ip6_src;                      /* swap destination and source protocoll address */
 	ip6.ip6_src = ns.nd_ns_target;
 	if(has_opt) {
--- a/src/subnet.c
+++ b/src/subnet.c
@ -1,6 +1,6 @@
 /*
    subnet.c -- handle subnet lookups and lists
-    Copyright (C) 2000-2019 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2014 Guus Sliepen <guus@tinc-vpn.org>,
                  2000-2005 Ivo Timmermans
    This program is free software; you can redistribute it and/or modify
@ -205,85 +205,21 @@ void subnet_del(node_t *n, subnet_t *subnet) {
 /* Ascii representation of subnets */
 bool str2net(subnet_t *subnet, const char *subnetstr) {
-	char str[1024];
+	int i, l;
 	strncpy(str, subnetstr, sizeof(str));
 	str[sizeof(str) - 1] = 0;
 	int consumed;
 	int weight = 10;
 	char *weight_separator = strchr(str, '#');
 	if(weight_separator) {
 		char *weight_str = weight_separator + 1;
 		if(sscanf(weight_str, "%d%n", &weight, &consumed) < 1) {
 			return false;
 		}
 		if(weight_str[consumed]) {
 			return false;
 		}
 		*weight_separator = 0;
 	}
 	int prefixlength = -1;
 	char *prefixlength_separator = strchr(str, '/');
 	if(prefixlength_separator) {
 		char *prefixlength_str = prefixlength_separator + 1;
 		if(sscanf(prefixlength_str, "%d%n", &prefixlength, &consumed) < 1) {
 			return false;
 		}
 		if(prefixlength_str[consumed]) {
 			return false;
 		}
 		*prefixlength_separator = 0;
 		if(prefixlength < 0) {
 			return false;
 		}
 	}
 	uint16_t x[8];
 	int weight = 10;
-	if(sscanf(str, "%hx:%hx:%hx:%hx:%hx:%hx%n", &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &consumed) >= 6 && !str[consumed]) {
+	if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d#%d",
-		/*
+	                &x[0], &x[1], &x[2], &x[3], &l, &weight) >= 5) {
-		   Normally we should check that each part has two digits to prevent ambiguities.
+		if(l < 0 || l > 32) {
 		   However, in old tinc versions net2str() will aggressively return MAC addresses with one-digit parts,
 		   so we have to accept them otherwise we would be unable to parse ADD_SUBNET messages.
 		*/
 		if(prefixlength >= 0) {
 			return false;
 		}
 		subnet->type = SUBNET_MAC;
 		subnet->weight = weight;
 		for(int i = 0; i < 6; i++) {
 			subnet->net.mac.address.x[i] = x[i];
 		}
 		return true;
 	}
 	if(sscanf(str, "%hu.%hu.%hu.%hu%n", &x[0], &x[1], &x[2], &x[3], &consumed) >= 4 && !str[consumed]) {
 		if(prefixlength == -1) {
 			prefixlength = 32;
 		}
 		if(prefixlength > 32) {
 			return false;
 		}
 		subnet->type = SUBNET_IPV4;
-		subnet->net.ipv4.prefixlength = prefixlength;
+		subnet->net.ipv4.prefixlength = l;
 		subnet->weight = weight;
-		for(int i = 0; i < 4; i++) {
+		for(i = 0; i < 4; i++) {
 			if(x[i] > 255) {
 				return false;
 			}
@ -294,73 +230,152 @@ bool str2net(subnet_t *subnet, const char *subnetstr) {
 		return true;
 	}
-	/* IPv6 */
+	if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d#%d",
-
+	                &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7],
-	char *last_colon = strrchr(str, ':');
+	                &l, &weight) >= 9) {
-
+		if(l < 0 || l > 128) {
 	if(last_colon && sscanf(last_colon, ":%hu.%hu.%hu.%hu%n", &x[0], &x[1], &x[2], &x[3], &consumed) >= 4 && !last_colon[consumed]) {
 		/* Dotted quad suffix notation, convert to standard IPv6 notation */
 		for(int i = 0; i < 4; i++)
 			if(x[i] > 255) {
 				return false;
 			}
 		snprintf(last_colon, sizeof(str) - (last_colon - str), ":%02x%02x:%02x%02x", x[0], x[1], x[2], x[3]);
 	}
 	char *double_colon = strstr(str, "::");
 	if(double_colon) {
 		/* Figure out how many zero groups we need to expand */
 		int zero_group_count = 8;
 		for(const char *cur = str; *cur; cur++)
 			if(*cur != ':') {
 				zero_group_count--;
 				while(cur[1] && cur[1] != ':') {
 					cur++;
 				}
 			}
 		if(zero_group_count < 1) {
 			return false;
 		}
 		/* Split the double colon in the middle to make room for zero groups */
 		double_colon++;
 		memmove(double_colon + (zero_group_count * 2 - 1), double_colon, strlen(double_colon) + 1);
 		/* Write zero groups in the resulting gap, overwriting the second colon */
 		for(int i = 0; i < zero_group_count; i++) {
 			memcpy(&double_colon[i * 2], "0:", 2);
 		}
 		/* Remove any leading or trailing colons */
 		if(str[0] == ':') {
 			memmove(&str[0], &str[1], strlen(&str[1]) + 1);
 		}
 		if(str[strlen(str) - 1] == ':') {
 			str[strlen(str) - 1] = 0;
 		}
 	}
 	if(sscanf(str, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx%n",
 	                &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7], &consumed) >= 8 && !str[consumed]) {
 		if(prefixlength == -1) {
 			prefixlength = 128;
 		}
 		if(prefixlength > 128) {
 			return false;
 		}
 		subnet->type = SUBNET_IPV6;
-		subnet->net.ipv6.prefixlength = prefixlength;
+		subnet->net.ipv6.prefixlength = l;
 		subnet->weight = weight;
-		for(int i = 0; i < 8; i++) {
+		for(i = 0; i < 8; i++) {
 			subnet->net.ipv6.address.x[i] = htons(x[i]);
 		}
 		return true;
 	}
 	if(sscanf(subnetstr, "%hu.%hu.%hu.%hu#%d", &x[0], &x[1], &x[2], &x[3], &weight) >= 4) {
 		subnet->type = SUBNET_IPV4;
 		subnet->net.ipv4.prefixlength = 32;
 		subnet->weight = weight;
 		for(i = 0; i < 4; i++) {
 			if(x[i] > 255) {
 				return false;
 			}
 			subnet->net.ipv4.address.x[i] = x[i];
 		}
 		return true;
 	}
 	if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx#%d",
 	                &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7], &weight) >= 8) {
 		subnet->type = SUBNET_IPV6;
 		subnet->net.ipv6.prefixlength = 128;
 		subnet->weight = weight;
 		for(i = 0; i < 8; i++) {
 			subnet->net.ipv6.address.x[i] = htons(x[i]);
 		}
 		return true;
 	}
 	if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx#%d",
 	                &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &weight) >= 6) {
 		subnet->type = SUBNET_MAC;
 		subnet->weight = weight;
 		for(i = 0; i < 6; i++) {
 			subnet->net.mac.address.x[i] = x[i];
 		}
 		return true;
 	}
 	// IPv6 short form
 	if(strstr(subnetstr, "::")) {
 		const char *p;
 		char *q;
 		int colons = 0;
 		// Count number of colons
 		for(p = subnetstr; *p; p++)
 			if(*p == ':') {
 				colons++;
 			}
 		if(colons > 7) {
 			return false;
 		}
 		// Scan numbers before the double colon
 		p = subnetstr;
 		for(i = 0; i < colons; i++) {
 			if(*p == ':') {
 				break;
 			}
 			x[i] = strtoul(p, &q, 0x10);
 			if(!q || p == q || *q != ':') {
 				return false;
 			}
 			p = ++q;
 		}
 		p++;
 		colons -= i;
 		if(!i) {
 			p++;
 			colons--;
 		}
 		if(!*p || *p == '/' || *p == '#') {
 			colons--;
 		}
 		// Fill in the blanks
 		for(; i < 8 - colons; i++) {
 			x[i] = 0;
 		}
 		// Scan the remaining numbers
 		for(; i < 8; i++) {
 			x[i] = strtoul(p, &q, 0x10);
 			if(!q || p == q) {
 				return false;
 			}
 			if(i == 7) {
 				p = q;
 				break;
 			}
 			if(*q != ':') {
 				return false;
 			}
 			p = ++q;
 		}
 		l = 128;
 		if(*p == '/') {
 			sscanf(p, "/%d#%d", &l, &weight);
 		} else if(*p == '#') {
 			sscanf(p, "#%d", &weight);
 		}
 		if(l < 0 || l > 128) {
 			return false;
 		}
 		subnet->type = SUBNET_IPV6;
 		subnet->net.ipv6.prefixlength = l;
 		subnet->weight = weight;
 		for(i = 0; i < 8; i++) {
 			subnet->net.ipv6.address.x[i] = htons(x[i]);
 		}
@ -372,7 +387,7 @@ bool str2net(subnet_t *subnet, const char *subnetstr) {
 bool net2str(char *netstr, int len, const subnet_t *subnet) {
 	if(!netstr || !subnet) {
-		logger(LOG_ERR, "net2str() was called with netstr=%p, subnet=%p!", (void *)netstr, (void *)subnet);
+		logger(LOG_ERR, "net2str() was called with netstr=%p, subnet=%p!", netstr, subnet);
 		return false;
 	}
@ -577,9 +592,9 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 	// Prepare environment variables to be passed to the script
-	xasprintf(&envp[0], "NETNAME=%s", netname ? netname : "");
+	xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
-	xasprintf(&envp[1], "DEVICE=%s", device ? device : "");
+	xasprintf(&envp[1], "DEVICE=%s", device ? : "");
-	xasprintf(&envp[2], "INTERFACE=%s", iface ? iface : "");
+	xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
 	xasprintf(&envp[3], "NODE=%s", owner->name);
 	xasprintf(&envp[4], "NAME=%s", myself->name);
@ -612,8 +627,13 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 			}
 			// Prepare the SUBNET and WEIGHT variables
-			free(envp[5]);
+			if(envp[5]) {
-			free(envp[6]);
+				free(envp[5]);
 			}
 			if(envp[6]) {
 				free(envp[6]);
 			}
 			xasprintf(&envp[5], "SUBNET=%s", netstr);
 			xasprintf(&envp[6], "WEIGHT=%s", weight);
@ -639,7 +659,7 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 		}
 	}
-	for(i = 0; i < 9; i++) {
+	for(i = 0; envp[i] && i < 9; i++) {
 		free(envp[i]);
 	}
 }
--- a/src/tincd.c
+++ b/src/tincd.c
@ -1,7 +1,7 @@
 /*
    tincd.c -- the main file for tincd
    Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2019 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2018 Guus Sliepen <guus@tinc-vpn.org>
                  2008      Max Rijevski <maksuf@gmail.com>
                  2009      Michael Tokarev <mjt@tls.msk.ru>
                  2010      Julien Muchembled <jm@jmuchemb.eu>
@ -37,10 +37,7 @@
 #include <openssl/rsa.h>
 #include <openssl/pem.h>
 #include <openssl/evp.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
 #include <openssl/bn.h>
 #ifdef HAVE_LZO
 #include LZO1X_H
@ -437,10 +434,7 @@ static bool keygen(int bits) {
 	BN_GENCB_set(cb, indicator, NULL);
 	rsa_key = RSA_new();
-
+	BN_hex2bn(&e, "10001");
 	if(BN_hex2bn(&e, "10001") == 0) {
 		abort();
 	}
 	if(!rsa_key || !e) {
 		abort();
@ -565,11 +559,25 @@ static void make_names(void) {
 }
 static void free_names() {
-	free(identname);
+	if(identname) {
-	free(netname);
+		free(identname);
-	free(pidfilename);
+	}
-	free(logfilename);
+
-	free(confbase);
+	if(netname) {
 		free(netname);
 	}
 	if(pidfilename) {
 		free(pidfilename);
 	}
 	if(logfilename) {
 		free(logfilename);
 	}
 	if(confbase) {
 		free(confbase);
 	}
 }
 static bool drop_privs() {
@ -654,7 +662,7 @@ int main(int argc, char **argv) {
 	if(show_version) {
 		printf("%s version %s\n", PACKAGE, VERSION);
-		printf("Copyright (C) 1998-2019 Ivo Timmermans, Guus Sliepen and others.\n"
+		printf("Copyright (C) 1998-2018 Ivo Timmermans, Guus Sliepen and others.\n"
 		       "See the AUTHORS file for a complete list.\n\n"
 		       "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
 		       "and you are welcome to redistribute it under certain conditions;\n"
@ -688,14 +696,14 @@ int main(int argc, char **argv) {
 	init_configuration(&config_tree);
-#ifndef OPENSSL_NO_ENGINE
+	/* Slllluuuuuuurrrrp! */
 	RAND_load_file("/dev/urandom", 1024);
 	ENGINE_load_builtin_engines();
 	ENGINE_register_all_complete();
 #endif
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 	OpenSSL_add_all_algorithms();
 #endif
 	if(generate_keys) {
 		read_server_config();
@ -814,13 +822,9 @@ end:
 	free(priority);
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
 	EVP_cleanup();
 	ERR_free_strings();
 #ifndef OPENSSL_NO_ENGINE
 	ENGINE_cleanup();
 #endif
 #endif
 	exit_configuration(&config_tree);
 	list_delete_list(cmdline_conf);
--- a/src/uml_device.c
+++ b/src/uml_device.c
@ -181,7 +181,10 @@ void close_device(void) {
 	unlink(device);
 	free(device);
-	free(iface);
+
 	if(iface) {
 		free(iface);
 	}
 }
 static bool read_packet(vpn_packet_t *packet) {
--- a/src/utils.c
+++ b/src/utils.c
@ -54,8 +54,8 @@ void bin2hex(char *src, char *dst, int length) {
 	}
 }
-#if defined(HAVE_MINGW) || defined(HAVE_CYGWIN)
+#if defined(HAVE_MINGW) || defined(HAVE___CYGWIN32__)
-#ifdef HAVE_CYGWIN
+#ifdef HAVE___CYGWIN32__
 #include <w32api/windows.h>
 #endif
--- a/src/utils.h
+++ b/src/utils.h
@ -24,11 +24,8 @@
 extern bool hex2bin(char *src, char *dst, int length);
 extern void bin2hex(char *src, char *dst, int length);
 #if defined(HAVE_MINGW) || defined(HAVE_CYGWIN)
 extern const char *winerror(int);
 #endif
 #ifdef HAVE_MINGW
 extern const char *winerror(int);
 #define strerror(x) ((x)>0?strerror(x):winerror(GetLastError()))
 #define sockerrno WSAGetLastError()
 #define sockstrerror(x) winerror(x)
--- a/src/xalloc.h
+++ b/src/xalloc.h
@ -2,7 +2,7 @@
 #define TINC_XALLOC_H
 /*
-   xalloc.h -- malloc and related functions with out of memory checking
+   xalloc.h -- malloc and related fuctions with out of memory checking
   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
   Copyright (C) 2011-2017 Guus Sliepen <guus@tinc-vpn.org>
--- a/systemd/Makefile.in
+++ b/systemd/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.2 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
-# Copyright (C) 1994-2020 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -281,8 +281,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -321,10 +321,7 @@ ctags CTAGS:
 cscope cscopelist:
-distdir: $(BUILT_SOURCES)
+distdir: $(DISTFILES)
 	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \