Better load distribution on multiple relays

2018-09-23 20:09:04 +02:00
parent acc8782043
commit 81c2364b7b
34 changed files with 67 additions and 67 deletions
--- a/etc/tor/instances/2/torrc
+++ b/etc/tor/instances/2/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/3/torrc
+++ b/etc/tor/instances/3/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/4/torrc
+++ b/etc/tor/instances/4/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/5/torrc
+++ b/etc/tor/instances/5/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/6/torrc
+++ b/etc/tor/instances/6/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/7/torrc
+++ b/etc/tor/instances/7/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/a/torrc
+++ b/etc/tor/instances/a/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/b/torrc
+++ b/etc/tor/instances/b/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/c/torrc
+++ b/etc/tor/instances/c/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/d/torrc
+++ b/etc/tor/instances/d/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/e/torrc
+++ b/etc/tor/instances/e/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/f/torrc
+++ b/etc/tor/instances/f/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/g/torrc
+++ b/etc/tor/instances/g/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/h/torrc
+++ b/etc/tor/instances/h/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/i/torrc
+++ b/etc/tor/instances/i/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/j/torrc
+++ b/etc/tor/instances/j/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/k/torrc
+++ b/etc/tor/instances/k/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/l/torrc
+++ b/etc/tor/instances/l/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/m/torrc
+++ b/etc/tor/instances/m/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/n/torrc
+++ b/etc/tor/instances/n/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/o/torrc
+++ b/etc/tor/instances/o/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/p/torrc
+++ b/etc/tor/instances/p/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/q/torrc
+++ b/etc/tor/instances/q/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/r/torrc
+++ b/etc/tor/instances/r/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/s/torrc
+++ b/etc/tor/instances/s/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/t/torrc
+++ b/etc/tor/instances/t/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/u/torrc
+++ b/etc/tor/instances/u/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/v/torrc
+++ b/etc/tor/instances/v/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/w/torrc
+++ b/etc/tor/instances/w/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/x/torrc
+++ b/etc/tor/instances/x/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/y/torrc
+++ b/etc/tor/instances/y/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/instances/z/torrc
+++ b/etc/tor/instances/z/torrc
@ -2,6 +2,6 @@ ClientUseIPv6 1
 ClientUseIPv4 1
 SOCKSPort 0
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/etc/tor/torrc
+++ b/etc/tor/torrc
@ -70,6 +70,6 @@ TransPort [::1]:9040
 DNSPort 54
 DNSPort [::1]:54
 MaxClientCircuitsPending 1024
-HardwareAccel 1
-AvoidDiskWrites 1
 NumEntryGuards 6
+NumDirectoryGuards 6
+NumPrimaryGuards 6
--- a/var/www/html/register.php
+++ b/var/www/html/register.php
@ -160,7 +160,7 @@ if(isset($_REQUEST['private_key'])){
 	echo htmlspecialchars($_REQUEST['private_key']);
 }
 echo '</textarea></td></tr>';
-echo '<tr><td colspan="2"><label><input type="checkbox" name="accept_privacy" required>I have read and agreed to the <a href="'.$host.'/privacy.php" target="_blank">Privacy Policy</a></label><br></td></tr>';
+echo '<tr><td colspan="2"><label><input type="checkbox" name="accept_privacy" required>I have read and agreed to the <a href="/privacy.php" target="_blank">Privacy Policy</a></label><br></td></tr>';
 echo '<tr><td colspan="2"><input type="submit" value="Register"></td></tr>';
 echo '</table></form>';
 echo '</body></html>';