Merge remote-tracking branch 'origin/topic/timw/1991-tunnel-swapping'

* origin/topic/timw/1991-tunnel-swapping:
  GH-1991: Add option to limit the number of tunnel_changed events

(cherry picked from commit 0ae485f715)

src/Conn.h

@@ -265,6 +265,7 @@ private:
 	int suppress_event; // suppress certain events to once per conn.
 	RecordValPtr conn_val;
 	std::shared_ptr<EncapsulationStack> encapsulation; // tunnels
+	uint8_t tunnel_changes = 0;
 
 	detail::ConnKey key;