Make non-exit relays actually not be exits

Tor's default is to exit based on the exit policy, but log a warning if
ExitRelay is not set. (Chutney also had some configs using the default exit
policy, which does not exit to localhost, so chutney could not use it to
verify.)

Fixes #17090.

torrc_templates/exit-v4.i

@@ -1,3 +1,5 @@
+# Must be included after relay-non-exit.tmpl
+ExitRelay 1
 
 # 1. Allow exiting to IPv4 localhost and private networks by default
 # -------------------------------------------------------------

torrc_templates/exit-v6.i

@@ -1,3 +1,5 @@
+# Must be included after relay-non-exit.tmpl
+ExitRelay 1
 
 # 1. Allow exiting to IPv6 localhost and private networks by default
 # ------------------------------------------------------------------

torrc_templates/relay-non-exit.tmpl

@@ -4,6 +4,9 @@ OrPort $orport
 Address $ip
 DirPort $dirport
 
+# Must be included before exit-v{4,6}.i
+ExitRelay 0
+
 #NOTE: Setting TestingServerConsensusDownloadSchedule doesn't
 #      help -- dl_stats.schedule is not DL_SCHED_CONSENSUS
 #      at boostrap time.