commit: experiment with 0.4.2.7

lib.d/do-configure.pl

@@ -546,7 +546,6 @@ sub DoProject {
 &SetEnv("suppress_methods_except_get", 0); # 1 = GET/HEAD Only
 &SetEnv("suppress_tor2web", 1); # 1 = block access by tor2web sites
 &SetEnv("template_tool", "$here/lib.d/expand-template.pl");
-&SetEnv("tor_intros_per_daemon", 5);
 &SetEnv("tor_single_onion", 1);
 &SetEnv("tor_syslog", "notice"); # https://www.torproject.org/docs/tor-manual.html.en
 &SetEnv("tor_template", "$here/templates.d/tor.conf.txt");
@@ -614,6 +613,7 @@ my @set_blank = qw(
     referer_blacklist_re
     referer_whitelist
     referer_whitelist_re
+    tor_intros_per_daemon
     user_agent_blacklist
     user_agent_blacklist_re
     user_agent_whitelist

opt.d/build-tor-on-raspbian-stretch.sh

@@ -1,7 +1,7 @@
 #!/bin/sh -x
 
 keyserver=keyserver.ubuntu.com
-torversion=0.3.5.7
+torversion=0.4.2.7
 torsigningkeys="6AFEE6D49E92B601 C218525819F78451"
 
 here=`dirname $0`

templates.d/tor.conf.txt

@@ -34,7 +34,9 @@ SocksPort 0 # frankly we don't want SOCKS anyway
 HiddenServiceDir %TOR_DIR%
 HiddenServicePort 80 unix:%TOR_DIR%/port-80.sock
 HiddenServicePort 443 unix:%TOR_DIR%/port-443.sock
+%%IF %TOR_INTROS_PER_DAEMON%
 HiddenServiceNumIntroductionPoints %TOR_INTROS_PER_DAEMON%
+%%ENDIF
 HiddenServiceVersion %ONION_VERSION%
 
 %%ELSE
@@ -43,7 +45,9 @@ HiddenServiceVersion %ONION_VERSION%
 HiddenServiceDir %PROJECT_DIR%/%ONION_DIRNAME%
 HiddenServicePort 80 unix:%PROJECT_DIR%/%ONION_DIRNAME%/port-80.sock
 HiddenServicePort 443 unix:%PROJECT_DIR%/%ONION_DIRNAME%/port-443.sock
+%%IF %TOR_INTROS_PER_DAEMON%
 HiddenServiceNumIntroductionPoints %TOR_INTROS_PER_DAEMON%
+%%ENDIF
 HiddenServiceVersion %ONION_VERSION%
 
 %%END