diff -Nru resolvconf-1.82ubuntu1/bin/resolvconf resolvconf-1.84ubuntu1/bin/resolvconf
--- resolvconf-1.82ubuntu1/bin/resolvconf	2020-01-03 17:32:03.000000000 +0000
+++ resolvconf-1.84ubuntu1/bin/resolvconf	2020-08-19 22:32:11.000000000 +0000
@@ -33,7 +33,7 @@
 	  *" "*) report_iface_err "Space" ; exit 1 ;;
 	  .*) report_iface_err "Initial dot" ; exit 1 ;;
 	  -*) report_iface_err "Initial hyphen" ; exit 1 ;;
-	  ~*) report_iface_err "Initial tilde" ; exit 1 ;;
+	  \~*) report_iface_err "Initial tilde" ; exit 1 ;;
 	esac
 	;;
   -u|--enable-updates|--disable-updates|--updates-are-enabled)
diff -Nru resolvconf-1.82ubuntu1/debian/changelog resolvconf-1.84ubuntu1/debian/changelog
--- resolvconf-1.82ubuntu1/debian/changelog	2020-08-05 13:21:25.000000000 +0000
+++ resolvconf-1.84ubuntu1/debian/changelog	2020-08-19 22:32:11.000000000 +0000
@@ -1,3 +1,28 @@
+resolvconf (1.84ubuntu1) groovy; urgency=medium
+
+  * Merge from Debian unstable
+    - Remaining changes:
+      * Skip pulling data into resolvconf, if isc-dhcp/ifupdown already push
+        the same data to systemd-resolved and it is in use.
+
+ -- Balint Reczey <rbalint@ubuntu.com>  Thu, 20 Aug 2020 00:32:11 +0200
+
+resolvconf (1.84) unstable; urgency=medium
+
+  [ Rob Leslie ]
+  * Escape "~*" to prevent spurious NSS lookups (Closes: #954175)
+
+ -- Andrej Shadura <andrewsh@debian.org>  Tue, 18 Aug 2020 18:40:14 +0200
+
+resolvconf (1.83) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Update resolvconf system units to prevent infinite restarts due to
+    continious re-execution of the PathExists stanza (Closes:
+    #968015). Thanks to Michael Biebl.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Tue, 18 Aug 2020 11:56:53 +0100
+
 resolvconf (1.82ubuntu1) groovy; urgency=medium
 
   * Skip pulling data into resolvconf, if isc-dhcp/ifupdown already push
diff -Nru resolvconf-1.82ubuntu1/debian/resolvconf.resolvconf-pull-resolved.path resolvconf-1.84ubuntu1/debian/resolvconf.resolvconf-pull-resolved.path
--- resolvconf-1.82ubuntu1/debian/resolvconf.resolvconf-pull-resolved.path	2020-01-03 17:32:03.000000000 +0000
+++ resolvconf-1.84ubuntu1/debian/resolvconf.resolvconf-pull-resolved.path	2020-08-19 22:32:11.000000000 +0000
@@ -1,6 +1,5 @@
 [Path]
 PathChanged=/run/systemd/resolve/stub-resolv.conf
-PathExists=/run/systemd/resolve/stub-resolv.conf
 
 [Install]
 WantedBy=systemd-resolved.service
diff -Nru resolvconf-1.82ubuntu1/debian/resolvconf.resolvconf-pull-resolved.service resolvconf-1.84ubuntu1/debian/resolvconf.resolvconf-pull-resolved.service
--- resolvconf-1.82ubuntu1/debian/resolvconf.resolvconf-pull-resolved.service	2020-01-03 17:32:03.000000000 +0000
+++ resolvconf-1.84ubuntu1/debian/resolvconf.resolvconf-pull-resolved.service	2020-08-19 22:32:11.000000000 +0000
@@ -1,7 +1,11 @@
 [Unit]
 ConditionPathExists=/run/resolvconf/enable-updates
 ConditionFileIsExecutable=/sbin/resolvconf
+After=systemd-resolved.service
 
 [Service]
 Type=oneshot
 ExecStart=+-/bin/sh -c 'cat /run/systemd/resolve/stub-resolv.conf | grep -v edns0 | /sbin/resolvconf -a systemd-resolved'
+
+[Install]
+WantedBy=systemd-resolved.service