Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact

static/defaults.config.php

@@ -429,10 +429,6 @@ return [
 		// Enable internal timings to help optimize code. Needed for "rendertime" addon.
 		'profiler' => false,
 
-		// proxy_cache_time (Integer)
-		// Period in seconds after which the cache is cleared.
-		'proxy_cache_time' => 86400,
-
 		// pushpoll_frequency (Integer)
 		// Frequency of contact poll for subhub contact using the DFRM or OStatus network.
 		// Available values:

static/settings.config.php

@@ -164,6 +164,10 @@ return [
 		// Comma separated list of tags that are rejected.
 		'relay_deny_tags' => '',
 
+		// proxify_content (Boolean)
+		// Use the proxy functionality for fetching external content
+		'proxify_content' => true,
+
 		// relay_directly (Boolean)
 		// Directly transmit content to relay subscribers without using a relay server
 		'relay_directly' => false,