- tor-commits - lists.torproject.org

[tor/main] fallbackdir: Regenerate the list for October 2021
by dgoulet＠torproject.org 21 Oct '21

21 Oct '21

commit 66e8e0f71bfb55019b5fea1017d1be3b3dc13895 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 21 09:13:40 2021 -0400 fallbackdir: Regenerate the list for October 2021 Closes #40493 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40493 | 2 + src/app/config/fallback_dirs.inc | 951 +++++++++++++++++++-------------------- 2 files changed, 472 insertions(+), 481 deletions(-) diff --git a/changes/ticket40493 b/changes/ticket40493 new file mode 100644 index 0000000000..eb9baf916b --- /dev/null +++ b/changes/ticket40493 @@ -0,0 +1,2 @@ + o Minor features (fallbackdir): + - Regenerate fallback directories for October 2021. Close ticket 40493. diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc index 75d01e26f8..ea1928e4c0 100644 --- a/src/app/config/fallback_dirs.inc +++ b/src/app/config/fallback_dirs.inc @@ -3,1086 +3,1075 @@ /* timestamp=20210412000000 */ /* source=offer-list */ // -// Generated on: Wed, 11 Aug 2021 12:54:23 +0000 +// Generated on: Thu, 21 Oct 2021 13:07:39 +0000 -"46.126.96.8 orport=9001 id=2C74829C382C1363812FC2BF053122A9DCF6583B" -/* nickname=ElNinoRelay */ +"62.210.105.46 orport=9001 id=ADB98B27D7A3FB5732068FD23602A1BCB3BE9F38" +/* nickname=Assange008fr */ /* extrainfo=0 */ /* ===== */ , -"85.214.141.24 orport=9001 id=BCC93B0ACA325374086A5100D02843A04EBDCC00" -" ipv6=[2a01:238:420e:ae00:1c37:63c1:24c0:ff75]:9001" -/* nickname=tor1VaxariNet */ +"95.128.43.164 orport=443 id=616081EC829593AF4232550DE6FFAA1D75B37A90" +" ipv6=[2a02:ec0:209:10::4]:443" +/* nickname=AquaRayTerminus */ /* extrainfo=0 */ /* ===== */ , -"185.76.191.83 orport=443 id=1730E41B3B004479D4EF124B5364CC34CE86F4EA" -/* nickname=x23tor83 */ +"5.79.79.133 orport=443 id=D079D6818926684C5979C18171FB18862A4A5792" +/* nickname=beerbox */ /* extrainfo=0 */ /* ===== */ , -"89.41.173.138 orport=443 id=B6942C63F1A596E6557D13FC0ACF8475A0A2AD3F" -/* nickname=owin */ +"91.121.103.117 orport=9001 id=CA53F344DB85248D69A97E900A0EC3C31AC04D25" +/* nickname=NoSuchRelay */ /* extrainfo=0 */ /* ===== */ , -"142.4.213.88 orport=443 id=552FBD8FC8E7C5AC05FC6F8C960BDAF1081413B2" -/* nickname=Unnamed */ +"109.70.100.9 orport=443 id=C8AE26D4819504D0157AD4C5DE7D5A0A7E190D10" +" ipv6=[2a03:e600:100::9]:443" +/* nickname=rucola */ /* extrainfo=0 */ /* ===== */ , -"148.251.191.252 orport=443 id=56781CCC9F6D29FEA148799AB588429C893A473C" -" ipv6=[2a01:4f8:211:d4f::2]:443" -/* nickname=scurra */ +"83.205.231.204 orport=9001 id=E05CAC929E391787077066C29461A9D22ECF0809" +/* nickname=albator */ /* extrainfo=0 */ /* ===== */ , -"51.89.143.155 orport=443 id=A932F56F69D24A96A0CBC4F32922A62DEFD28C77" -/* nickname=UenoStation55 */ +"37.252.187.111 orport=443 id=EE4AF632058F0734C1426B1AD689F47445CA2056" +" ipv6=[2a00:63c1:c:111::2]:443" +/* nickname=rinderwahnRelay7L */ /* extrainfo=0 */ /* ===== */ , -"86.80.108.228 orport=9001 id=69497036653189531207746B3D0E4ECB56888F3C" -/* nickname=octavsly */ +"144.76.157.242 orport=9001 id=00C22D3BC1822EB8EA380AF04245337399E796E2" +" ipv6=[2a01:4f8:200:30f5::103]:9001" +/* nickname=iriseden */ /* extrainfo=0 */ /* ===== */ , -"54.37.232.61 orport=443 id=973B219FDAC30873212D866568B30C44D57B32E5" -/* nickname=NikowskiThirdNode */ +"212.47.233.86 orport=9001 id=B4CAFD9CBFB34EC5DAAC146920DC7DFAFE91EA20" +" ipv6=[2001:bc8:630:194::1]:9001" +/* nickname=netimanmu */ /* extrainfo=0 */ /* ===== */ , -"185.76.191.76 orport=443 id=837528CA94748B72CE1829E4E23A7EAB232C30E6" -/* nickname=x23tor76 */ +"173.212.231.228 orport=9001 id=55403B9653A81F68C39787E000BD9F97E1F3B250" +/* nickname=StriveForFreedom */ /* extrainfo=0 */ /* ===== */ , -"45.140.170.187 orport=9001 id=A9B28E4D4FB6A26B5B6D3EDED2655D836BBD4E57" -/* nickname=Assange011ruX */ +"62.216.54.29 orport=9001 id=16824F885D72B4FA7A5090E08D877E5404BC214D" +/* nickname=guidemenow */ /* extrainfo=0 */ /* ===== */ , -"81.83.37.138 orport=9001 id=B22A56D8AE494A20CA0EB8457F3CAC54FC99ACCE" -" ipv6=[2a02:1810:38a2:d400:ba27:ebff:fec2:3e7e]:9001" -/* nickname=Unnamed */ +"213.239.213.190 orport=443 id=4E98AA295B7171996D18DD1F6A19F64AB4036B4A" +/* nickname=summalummadooma */ /* extrainfo=0 */ /* ===== */ , -"82.64.163.188 orport=9001 id=4F95B7313679ECC000F38F870CF0CF39C7386C50" -/* nickname=Ajorcel */ +"5.9.37.162 orport=9001 id=6C1A8CBE589906EEC6E73F4F286AC29AF7521E1D" +" ipv6=[2a01:4f8:161:21a9::2]:9001" +/* nickname=vahShei7Eeth */ /* extrainfo=0 */ /* ===== */ , -"104.244.73.93 orport=9000 id=6183B493ACFF41B28745CF0322E75AD7BDE4A48B" -" ipv6=[2605:6400:30:f73d:de71:a4eb:1b99:9545]:9000" -/* nickname=Quetzalcoatl */ +"82.69.47.114 orport=443 id=43E896D36AAB20B5B63094BBC52CAD4B560E47BF" +/* nickname=DeLoreanDynamite */ /* extrainfo=0 */ /* ===== */ , -"194.38.21.10 orport=9001 id=690FC3ACBBBC970309A9A0993EE12AF44C0C8E62" -/* nickname=Rowlet */ +"51.15.177.140 orport=993 id=ECD239A3B2CAD7375D218B624BCA270CDBFE2A29" +" ipv6=[2001:bc8:3fec:500:7ea::]:993" +/* nickname=Casper10 */ /* extrainfo=0 */ /* ===== */ , -"58.185.69.242 orport=8443 id=DF6F2B91C93270771C8EC92D243A7CB6234244A1" -/* nickname=orangepeel */ +"209.141.57.122 orport=443 id=051FB296CDF787B5B97A9F2C5CD6FA3E10C27045" +/* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"49.194.93.54 orport=9001 id=0D8877392F2FF5AD8D8E5BC438087F02EF97B904" -/* nickname=Starlight */ +"193.234.15.58 orport=443 id=F24F8BEA2779A79111F33F6832B062BED306B9CB" +" ipv6=[2a00:1c20:4089:1234:cdae:1b3e:cc38:3d45]:443" +/* nickname=jaures2 */ /* extrainfo=0 */ /* ===== */ , -"82.35.159.1 orport=9001 id=289F955FA04BD224F18DED9D4766529705FBDC48" -/* nickname=PixelBullyRelay */ +"185.228.138.252 orport=8080 id=91BAB54C6923454F4E5EDC59313C45002B238665" +" ipv6=[2a03:4000:23:409:748d:52ff:fe41:cdcc]:8080" +/* nickname=CryptoHouse */ /* extrainfo=0 */ /* ===== */ , -"37.157.254.37 orport=443 id=9423A72BBC8B5C6AC9DE9F57735EB2B08E4156E8" -" ipv6=[2001:4ba0:ffff:11a::3]:443" -/* nickname=TorOrDie4privacyNET */ +"77.23.45.123 orport=9001 id=5887DD4FC027A14DE4985429C38BF78C297B7795" +/* nickname=Shredder */ /* extrainfo=0 */ /* ===== */ , -"78.46.85.216 orport=9001 id=9738F8F5C386CDAF5707D0DCED428F2813CA285F" -" ipv6=[2a01:4f8:120:1381::2]:9001" -/* nickname=astolfo */ +"82.103.140.87 orport=443 id=A1B7C1F83E5DA4376FD2E1DBA7AC28A71AB332AD" +/* nickname=arnall */ /* extrainfo=0 */ /* ===== */ , -"104.244.74.28 orport=9001 id=2DB8A946826D0CB4F5C3A8264628DD0F16F6612D" -/* nickname=a9Exit */ +"37.221.66.248 orport=443 id=A28D6C0BAA9EEBD288713357C46CF6EF081EF673" +" ipv6=[2001:678:6d4:6020::4dea:105]:443" +/* nickname=DTFNODE64 */ /* extrainfo=0 */ /* ===== */ , -"142.4.213.112 orport=443 id=E12235C7310A4ABED3480E907F6D9BD1DC1E1D6C" -/* nickname=Unnamed */ +"109.70.100.1 orport=443 id=530277866466A1425F43A73DBFCB5FC7410C9852" +" ipv6=[2a03:e600:100::1]:443" +/* nickname=spargel */ /* extrainfo=0 */ /* ===== */ , -"68.196.180.5 orport=8443 id=954B2AEA8FDCF0DF701A2EC9285640B929546DF7" -/* nickname=MrRobotLives */ +"185.82.127.141 orport=9001 id=34FA04EFC21C4B8461FCE82E908FDD53DF1E7962" +/* nickname=s0menickname */ /* extrainfo=0 */ /* ===== */ , -"45.91.67.90 orport=9001 id=023DB955544865BB4D593DE66E89B496777DF0F0" -/* nickname=lavandeluxe2 */ +"45.76.218.50 orport=9001 id=1FCA426BBD7EDCC6C0FFF013D0FD9531B16A5845" +/* nickname=myTorRelay2 */ /* extrainfo=0 */ /* ===== */ , -"89.212.26.36 orport=9001 id=25A3C92EB11A140B006695D0009F6EAEAF3C6785" -/* nickname=mrrm87 */ +"54.36.205.38 orport=9001 id=5DB9AE27A44EB7B476CC04A66C67A71C97A001E6" +/* nickname=Chenjesu */ /* extrainfo=0 */ /* ===== */ , -"116.203.245.170 orport=443 id=5EB36D1BFC513A66F52A969AB23456E92D2ABB46" -" ipv6=[2a01:4f8:c2c:4582::1]:443" -/* nickname=alpha */ +"185.72.247.145 orport=9001 id=130E69E8F783DEF256E757FA78154B7DC2A39E0E" +/* nickname=funkturm */ /* extrainfo=0 */ /* ===== */ , -"185.220.101.13 orport=30013 id=48BE372CA2104D2422D49CD321060E7F697B52D9" -" ipv6=[2a0b:f4c2::13]:20013" -/* nickname=relayon0138 */ +"140.78.100.38 orport=5443 id=23D5D8219A8EB7610AB33CFAD589FD72A844356A" +/* nickname=INSRelay38at5443 */ /* extrainfo=0 */ /* ===== */ , -"37.221.198.114 orport=9001 id=FABA6394C790E96812D33689FAE90796FBA79AA8" -" ipv6=[2a03:4000:9:533::2]:9001" -/* nickname=fiedlerRelay17 */ +"173.75.39.61 orport=9001 id=023EBBC57BEB7F45473B3DC2AA811FB3AABA4466" +/* nickname=tconionrelay */ /* extrainfo=0 */ /* ===== */ , -"163.172.194.53 orport=9001 id=8C00FA7369A7A308F6A137600F0FA07990D9D451" -" ipv6=[2001:bc8:225f:142:6c69:7461:7669:73]:9001" -/* nickname=GrmmlLitavis */ +"185.4.132.135 orport=443 id=A0056E0F3773DD99C1ED298B956A2ACEE1BFB5FD" +/* nickname=Grexit */ /* extrainfo=0 */ /* ===== */ , -"185.220.100.243 orport=9100 id=E8AD8C4FDC3FE152150C005BB2EAA6A0990B74DF" -" ipv6=[2a0b:f4c0:16c:13::1]:9100" -/* nickname=F3Netze */ +"104.244.77.250 orport=443 id=E312A938D71045BE3A5C1FF3AB87CF7464194861" +" ipv6=[2605:6400:30:faa9:4abe:8b09:7ef9:18e6]:443" +/* nickname=Daenerys */ /* extrainfo=0 */ /* ===== */ , -"198.245.49.6 orport=443 id=15B434A2AC13ADE9E3F7EE6C0A740A377300F1D0" -/* nickname=Unnamed */ +"45.67.229.37 orport=9001 id=34F2DBF5595FF8323665BEC7DD8D2D28F9697B2C" +/* nickname=Pickachu */ /* extrainfo=0 */ /* ===== */ , -"78.194.37.29 orport=9001 id=625743FAF41B791AAFC2D4BF859DA4AAA2E81FE7" -/* nickname=Zion */ +"193.108.117.103 orport=9001 id=438F3EA4C9FB0DB63F5377A3271AB5435FAD7E04" +/* nickname=dolemite */ /* extrainfo=0 */ /* ===== */ , -"89.163.128.28 orport=9001 id=2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC" -" ipv6=[2001:4ba0:ffff:237::babe]:9001" -/* nickname=Doedel24 */ +"158.101.138.180 orport=443 id=B1A0F1143789466AADD5FAE5948C8138548EECEC" +" ipv6=[2603:c021:8000:d00::c1]:443" +/* nickname=KagamineLenWoRd */ /* extrainfo=0 */ /* ===== */ , -"174.127.169.233 orport=9001 id=4E9796481C1E75F75D57E8C1FC8C8ED111433316" -/* nickname=brwyatt2 */ +"110.141.223.194 orport=9001 id=1619F4FCE1C5324CAB703EAD94285B1ABE39F912" +/* nickname=PCGGRelay */ /* extrainfo=0 */ /* ===== */ , -"45.79.70.147 orport=9001 id=7DB8443AE29FBC450D34E55FA914F42BF929EE49" -" ipv6=[2600:3c01::f03c:92ff:fe97:5ebe]:9001" -/* nickname=1chandotus */ +"104.149.139.42 orport=8080 id=270EECB837AD914C01ACC777152AEEB1EBCDBDE5" +/* nickname=Phoenix */ /* extrainfo=0 */ /* ===== */ , -"51.68.173.83 orport=9001 id=1E70B9253E33D32F69B380B7C5AB0475F22DD349" -/* nickname=Unnamed */ +"58.107.88.237 orport=9001 id=0D8877392F2FF5AD8D8E5BC438087F02EF97B904" +/* nickname=Starlight */ /* extrainfo=0 */ /* ===== */ , -"104.244.79.121 orport=443 id=570520A8DB8D2BAA95A8AB438C7FB61FE9555746" -/* nickname=doukai */ +"198.245.61.171 orport=443 id=B1AE47B97B6952B3B8B2CD19B57183CF5C801348" +/* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"147.135.112.139 orport=9001 id=E0023AC14180112A2FFF00A84C6049862BB3E6C3" -/* nickname=DerrickJensen */ +"198.211.40.226 orport=9001 id=CB5700E1FB46FC98251DD8F0852B63A3B78DB830" +/* nickname=jaalkabil */ /* extrainfo=0 */ /* ===== */ , -"37.187.98.185 orport=22 id=342A1AC764D89248E66458C077CFF668D05FFF34" -" ipv6=[2001:41d0:a:22b9::1]:22" -/* nickname=aergia */ +"94.130.200.167 orport=443 id=CD39C258265B25EAA4ABA4FDCB2DF98104CAA362" +/* nickname=normaray */ /* extrainfo=0 */ /* ===== */ , -"51.75.82.166 orport=443 id=7B57933E29D520471D7E67AB48B06B62832828F9" -/* nickname=sandman1 */ +"136.243.60.188 orport=9001 id=675CFAC38BE3C9A26C3A2DD7CBC0E616F68624CA" +" ipv6=[2a01:4f8:212:1b8b:3::8]:9001" +/* nickname=mullbinde5 */ /* extrainfo=0 */ /* ===== */ , -"185.86.150.58 orport=9001 id=8E76F1F6E8499CCE975C451560586A5F8BF0BFDB" -/* nickname=JimmyBulanik */ +"81.28.206.216 orport=9001 id=BC5F00B573D277C4BFA8F0FBAA47E074D0994C1C" +/* nickname=fs0ciety */ /* extrainfo=0 */ /* ===== */ , -"91.219.236.197 orport=443 id=1D97A312D98C4D677112265659BD69A83C3AF9E4" -/* nickname=BeAnon */ +"78.198.147.227 orport=9001 id=867982ADCFBE55EC1C00A5B34C8991FF87605906" +/* nickname=roTor */ /* extrainfo=0 */ /* ===== */ , -"31.131.4.171 orport=443 id=AED4A69836630A3375845006B5AAD03BFA3F96DC" -/* nickname=1torexit */ +"23.239.113.101 orport=443 id=F98A70E5427BFF111640011F7AE31E537ECF1DD2" +/* nickname=MarinAsagi */ /* extrainfo=0 */ /* ===== */ , -"209.141.40.46 orport=443 id=68514D6AF3A500C61E5C8A03B0C1E1ADDAC62462" -/* nickname=spotyor */ +"173.212.219.49 orport=6666 id=0A5476625BAC0573A82FCB432ACED70E1ED83E93" +" ipv6=[2a02:c207:2047:1305::1]:6666" +/* nickname=OhYee */ /* extrainfo=0 */ /* ===== */ , -"2.230.193.197 orport=9003 id=A9EDB4EBF9EF5F3A129A58AE28EF92DB4B5078A3" -/* nickname=FreeTurkey */ +"52.205.15.239 orport=9001 id=87AA1BE4A39529DD86194738DFB59DC698F3136B" +/* nickname=BarryBen */ /* extrainfo=0 */ /* ===== */ , -"104.244.74.121 orport=9100 id=2EC5EE348BD8D9D2E518B2CAEA9C671E2D5F77A6" -" ipv6=[2605:6400:30:f6ed:c6a7:9997:d411:cb21]:9100" -/* nickname=Quetzalcoatl */ +"68.71.27.78 orport=9001 id=262B0B749C9088446A5521C4E98173DED815FD5A" +/* nickname=ALiteralBird */ /* extrainfo=0 */ /* ===== */ , -"152.89.104.206 orport=9001 id=DD0AA66DD9E4E71FFAFAB658DF8300F1CEEA0364" -" ipv6=[2a03:4000:39:45c:241f:53ff:fe4e:45e9]:9001" -/* nickname=flowjob04 */ +"185.162.251.135 orport=9001 id=166850D169CC7956E77525A1A9228BC4563CFC8B" +" ipv6=[2a03:4000:1a:5c5:38dc:87ff:fe07:85fb]:9001" +/* nickname=Piratenpartei10 */ /* extrainfo=0 */ /* ===== */ , -"114.108.58.201 orport=443 id=412767ECB0CEF7DCBAF8748DDBA8575860DD6782" -/* nickname=winterferien */ +"157.90.38.9 orport=443 id=42A51FFF7AB2A2F396CB924B56676F09BCB52245" +/* nickname=SoySauceR */ /* extrainfo=0 */ /* ===== */ , -"68.67.32.32 orport=9001 id=3DB72310F6999555E71A09C3FCDF86E8E99118F7" -/* nickname=hKnYTKYgoYx4JmnAwu9 */ +"217.79.178.53 orport=444 id=9C1559C46AD0279EEF6FD187E1B27D939C303086" +" ipv6=[2001:4ba0:cafe:5bf::1]:444" +/* nickname=JanKuciak */ /* extrainfo=0 */ /* ===== */ , -"107.189.30.230 orport=9001 id=B12536F2F1BBFE0B47FAAD0D5D05BFAEC6C2DE9F" -/* nickname=Hydra40 */ +"195.154.112.228 orport=9001 id=CC2DD888299ED7B7CA7D7B930352A074EBE1E906" +/* nickname=justarandomrelay */ /* extrainfo=0 */ /* ===== */ , -"51.178.26.103 orport=443 id=FFF4E4F51077370085A339B1F81A02BF3C2F52C9" -" ipv6=[2001:41d0:305:2100::8550]:443" -/* nickname=corvuscorax */ +"91.194.84.89 orport=8443 id=1AAC19D892F84910AB94C45092241ABA3CFC4C89" +" ipv6=[2001:4ba0:ffff:1ce::2]:8443" +/* nickname=ForPrivacyNET */ /* extrainfo=0 */ /* ===== */ , -"192.166.245.82 orport=443 id=8E8A46FADE96BFEA4F16CC23A25ADC05E00AE1AB" -/* nickname=DTFNODE28 */ +"159.196.69.117 orport=9001 id=B9A8969537739F89CBB02E2A91CECFE154B276C7" +/* nickname=Aurora */ /* extrainfo=0 */ /* ===== */ , -"95.217.15.17 orport=443 id=1A10F6E2BA45CA4A5EBAA6EF759FCBF4E8AFEEA8" -" ipv6=[2a01:4f9:c010:7066::1]:443" -/* nickname=bias */ +"46.38.236.250 orport=9001 id=20974D28EB668E689D4256046E0E32034375A0A2" +" ipv6=[2a03:4000:2:ba4:88e9:eff:fe89:3637]:9001" +/* nickname=cvbnet1 */ /* extrainfo=0 */ /* ===== */ , -"199.249.230.189 orport=443 id=521C30A968743B13E17E22E39BE52DA020FB92E1" -" ipv6=[2620:7:6001::189]:80" -/* nickname=Quintex100 */ +"209.141.39.200 orport=443 id=D0F40C637C5F93D823AAC497007FD07A2F0FABB5" +" ipv6=[2605:6400:20:21de::1]:443" +/* nickname=HogTheHedges */ /* extrainfo=0 */ /* ===== */ , -"109.70.100.15 orport=443 id=DE847D94E78B2E560AB87D272DC90192D3144F17" -" ipv6=[2a03:e600:100::15]:443" -/* nickname=kohlrabi */ +"5.135.156.12 orport=4899 id=5558F546D2A996DD2F4B6A62A218DF23848452E3" +/* nickname=jakfrancjamoze */ /* extrainfo=0 */ /* ===== */ , -"185.73.211.3 orport=50001 id=8699371415DC052A60BCA3AAD68E55D9B759CAE0" -" ipv6=[2a00:8dc0:aa00::13]:50001" -/* nickname=torrorist */ +"83.161.151.178 orport=9001 id=A98ADD972045D3CCAEE65C788C3F175BAEA3E324" +/* nickname=2Contribute */ /* extrainfo=0 */ /* ===== */ , -"37.187.21.49 orport=9001 id=15483893699246724B8135CC6F087767EA89A2D3" -" ipv6=[2001:41d0:a:1531::1]:9001" -/* nickname=rackhamsaltair */ +"85.214.141.24 orport=9001 id=BCC93B0ACA325374086A5100D02843A04EBDCC00" +" ipv6=[2a01:238:420e:ae00:1c37:63c1:24c0:ff75]:9001" +/* nickname=tor1VaxariNet */ /* extrainfo=0 */ /* ===== */ , -"67.3.168.113 orport=443 id=EC4B6AF202EFE752C4D9E2FBD092C4EAE779ADA1" -/* nickname=Unnamed */ +"199.195.250.77 orport=443 id=58B44B5591A96EC08114B041CC6B1BB1521DF2BE" +" ipv6=[2605:6400:10:549::1]:443" +/* nickname=UnvisitedNativity */ /* extrainfo=0 */ /* ===== */ , -"5.189.148.225 orport=9001 id=5F48BA138AC6F7B42CC7A0B0D4012541DFEB9677" -/* nickname=TrafficAdvanceNetw */ +"185.100.87.250 orport=8443 id=ABD9D46C3C026CF6B88574A0707D0BF75A067999" +" ipv6=[2a06:1700:0:12::1]:8443" +/* nickname=artikel10buc01 */ /* extrainfo=0 */ /* ===== */ , -"213.183.60.21 orport=443 id=39F91959416763AFD34DBEEC05474411B964B2DC" -" ipv6=[2a06:f904:1:100::4b]:443" -/* nickname=rinderwahnRelay11L */ +"178.20.55.16 orport=443 id=EFAE44728264982224445E96214C15F9075DEE1D" +/* nickname=marcuse1 */ /* extrainfo=0 */ /* ===== */ , -"54.38.92.43 orport=9001 id=63540827C4832D214984EA47B7A68C593F9F862F" -/* nickname=Unnamed */ +"151.237.185.134 orport=9001 id=1BBD716B4973D96E570D334A5776978BFF7E0E5D" +/* nickname=lecirque */ /* extrainfo=0 */ /* ===== */ , -"178.20.55.16 orport=443 id=EFAE44728264982224445E96214C15F9075DEE1D" -/* nickname=marcuse1 */ +"213.164.218.224 orport=443 id=3C7F402F5C62A96C7E0DCD5CC850AADF88393802" +/* nickname=Chani */ /* extrainfo=0 */ /* ===== */ , -"37.187.102.108 orport=443 id=F4263275CF54A6836EE7BD527B1328836A6F06E1" -" ipv6=[2001:41d0:a:266c::1]:443" -/* nickname=EvilMoe */ +"51.83.131.42 orport=9001 id=8F293A6484A0973167B15C4997AB9F24C21143FE" +/* nickname=Hydra24 */ /* extrainfo=0 */ /* ===== */ , -"51.15.65.243 orport=443 id=9B5ED3370E002AEBB2A9B25E3213C1817CCD2D88" -" ipv6=[2001:bc8:1830:180b::1]:443" -/* nickname=fleischgewehr */ +"172.105.89.143 orport=9007 id=26C15ED5282382A843D0774F5170BCCCCCC46D63" +" ipv6=[2a01:7e01::f03c:92ff:fe7c:85f7]:9007" +/* nickname=BestofbestBackup */ /* extrainfo=0 */ /* ===== */ , -"188.126.83.38 orport=443 id=E0A3471C24C9021CC58FBF774203046FD2BC893F" -/* nickname=redsox */ +"179.43.169.20 orport=443 id=65E40F7EDD28E2CF28684E30E0BAB7706819CFC3" +/* nickname=Fangio */ /* extrainfo=0 */ /* ===== */ , -"151.115.56.33 orport=443 id=91094CEBDA0C921923EA4213A209B14216F09AC1" -/* nickname=ENC2WAW1984 */ +"174.89.83.82 orport=9001 id=C8705CB63A3D3060A649D9FA0514E7E60A1E1A2B" +/* nickname=metM0r */ /* extrainfo=0 */ /* ===== */ , -"185.220.101.137 orport=10210 id=28F4F392F8F19E3FBDE09616D9DB8143A1E2DDD3" -" ipv6=[2a0b:f4c2:1::137]:10210" -/* nickname=relayon0210 */ +"68.160.242.214 orport=9001 id=6111C6005AB56498BE5E35666B2522CEBE17D14E" +/* nickname=jsRelay */ /* extrainfo=0 */ /* ===== */ , -"46.194.163.28 orport=65534 id=7BE9E2EF2BB41BB662D9A3CD68289B9E3DBF8A08" -/* nickname=WYSWYG */ +"144.76.216.252 orport=9001 id=6B88E20FEE8EB47F1A8E30207F327005C61A013D" +" ipv6=[2a01:4f8:200:8261::b0]:9001" +/* nickname=slacknet */ /* extrainfo=0 */ /* ===== */ , -"85.214.196.178 orport=9001 id=EAD250EE6D1BDB1BBACFFD1C3C262D59FD55A41A" -" ipv6=[2a01:238:4306:cf00:ec59:d2a4:ac11:336]:9050" -/* nickname=Zwiebelring */ +"209.141.54.168 orport=443 id=A66E5782FE6097D2824044466776FE912AEFD85B" +" ipv6=[2605:6400:20:274::1]:443" +/* nickname=alxu2 */ /* extrainfo=0 */ /* ===== */ , -"23.129.64.133 orport=443 id=FC773D88785CF34CF0028BA13C5CBD32CAB27AE2" -" ipv6=[2620:18c:0:192::133]:443" -/* nickname=undervillian */ +"107.189.31.241 orport=9100 id=82CE42D04B5BA616E611E4758861C864B2ACFCA8" +" ipv6=[2605:6400:30:f02a:faff:1d57:32b7:157f]:9100" +/* nickname=Quetzalcoatl */ /* extrainfo=0 */ /* ===== */ , -"185.220.101.14 orport=10014 id=957354D72042719C310A907FBFE42A3232C78757" -" ipv6=[2a0b:f4c2::14]:10014" -/* nickname=relayon0142 */ +"123.255.62.137 orport=9001 id=803FB98BA0FE1709C087E9138CC6096F22083CA5" +/* nickname=Damnation */ /* extrainfo=0 */ /* ===== */ , -"188.127.226.102 orport=110 id=B05B3AB0159238FB7AEB1BF08A406D6F31A45ADF" -" ipv6=[2a06:dd00:1:12:a11:90d5:be:11e5]:110" -/* nickname=eludemailrelay */ +"5.56.221.113 orport=4020 id=605EE4375EE4C38215C8949F5808863749FD4F4A" +/* nickname=arcanum */ /* extrainfo=0 */ /* ===== */ , -"45.33.46.101 orport=9001 id=07623013C3361FE566B71C8CFCC6483D7587A827" -/* nickname=FreedomFries01 */ +"24.151.37.55 orport=42069 id=343EC037D633150AFFCC8471E805AABAE1B1D871" +/* nickname=BringMeToLife */ /* extrainfo=0 */ /* ===== */ , -"116.203.23.183 orport=9001 id=5D377009B7538DE1423C4FBEB82370040394A9FF" -" ipv6=[2a01:4f8:c0c:ae0c::1]:9001" -/* nickname=SCSYSTEMSRELAY01 */ +"212.74.233.22 orport=9011 id=66B06D59BDFC90EBC6EDE79C558275F2CD4799B0" +/* nickname=daytoner */ /* extrainfo=0 */ /* ===== */ , -"140.78.100.43 orport=8443 id=BC6E80744314F16054A64EE0F2302F082C929958" -/* nickname=INSRelay43at8443 */ +"185.32.221.201 orport=443 id=03DC081E4409631006EFCD3AF13AFAAF2B553FFC" +/* nickname=krigernes */ /* extrainfo=0 */ /* ===== */ , -"78.46.202.212 orport=9010 id=28D20B990E48FCA20857DBDF12997C323C125124" -" ipv6=[2a01:4f8:c0c:162b::1]:9010" -/* nickname=dvbhorst */ +"199.249.230.166 orport=443 id=1BBCAEB763CA46DEB565A7251FAA6AC79A388ADD" +" ipv6=[2620:7:6001::166]:80" +/* nickname=Quintex77 */ /* extrainfo=0 */ /* ===== */ , -"80.100.69.97 orport=9001 id=19083549B3F2BFD96FAACA934D7872CD578A8B99" -/* nickname=raspitor3 */ +"92.38.163.65 orport=9001 id=C8AAADD3FD1470E7D60D8BC4500F95825F35057D" +" ipv6=[2a03:90c0:83:2908::169]:443" +/* nickname=Lux4 */ /* extrainfo=0 */ /* ===== */ , -"89.163.128.26 orport=9001 id=8FA37B93397015B2BC5A525C908485260BE9F422" -" ipv6=[2001:4ba0:ffff:237::abba]:9001" -/* nickname=Doedel22 */ +"193.111.26.37 orport=443 id=C9D02B1644BD47C136E379FDFAF4973D1A1CE07C" +/* nickname=8af34cb1 */ /* extrainfo=0 */ /* ===== */ , -"38.39.192.78 orport=443 id=A96DA63E4415E776FBFCCF3DA7154C804534B6E7" -/* nickname=3735928559 */ +"132.226.162.148 orport=9001 id=45047C78E1F5E7B775B0A42F118D4ED64504D09E" +" ipv6=[2603:c021:c003:3511:1::]:9001" +/* nickname=plithismos */ /* extrainfo=0 */ /* ===== */ , -"201.114.166.24 orport=9001 id=C0417071C3754885296F4A5935AC1BC1CABDBC31" -/* nickname=toritoinfinito */ +"185.220.102.250 orport=993 id=35B503FB546815CC9EDE91022555B5D0ED04E389" +" ipv6=[2a0b:f4c1:2::250]:993" +/* nickname=Digitalcourage4ip3b */ /* extrainfo=0 */ /* ===== */ , -"52.214.94.163 orport=9001 id=430672CD7162FA88AB49D891C38567799F346333" -/* nickname=Isidore */ +"95.216.145.127 orport=9001 id=5EF0AAAEEE7B1282DA0DBAB94669B73E39DD51B6" +/* nickname=MyCoolNick */ /* extrainfo=0 */ /* ===== */ , -"195.176.3.24 orport=8443 id=8C25BA134D579B8AAF420E01215EB2CF06AAE907" -" ipv6=[2001:620:20d0::24]:8443" -/* nickname=DigiGesTor5e4 */ +"84.160.69.190 orport=9001 id=1388AB40396F57ED95BB6036E6504CE8E0F622B8" +/* nickname=BurnerMeetsTOR */ /* extrainfo=0 */ /* ===== */ , -"37.191.195.28 orport=8443 id=BB004C7F4C5C9FAE5E001864537F89388444F572" -/* nickname=Unnamed */ +"178.17.173.26 orport=9001 id=7332A06B00D6AF54AA804F03C624DFBBC9E66172" +" ipv6=[2a00:1dc0:2451:10::3]:9001" +/* nickname=MoldEraTor */ /* extrainfo=0 */ /* ===== */ , -"72.132.134.217 orport=443 id=188FC071EBD1901AFEAFC68603C63D43F989709F" -/* nickname=anomaly */ +"172.222.102.43 orport=9001 id=C8A8423DDB3C7E62D0F2A7A88B09BA68710B6AF2" +/* nickname=margate */ /* extrainfo=0 */ /* ===== */ , -"104.178.168.242 orport=9001 id=AB6072166366C2E245F95905310431357B581F9C" -" ipv6=[2600:1700:c0:5678::9001]:9001" -/* nickname=AaronSwartz */ +"5.45.104.171 orport=22 id=D30734EC319A37E15155F6B710E9CC8F987FC772" +" ipv6=[2a03:4000:6:1547:92dc:911c:7899:e0f2]:22" +/* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"45.14.233.160 orport=443 id=DDC3D816F2B229CEFF613E4D912CD79EE34024EF" -" ipv6=[2a0e:1580:1000::2dff:fe0e:e9a0]:443" -/* nickname=mikrogravitation03 */ +"37.120.184.36 orport=9001 id=A7317673B923B591066204FFD299AB2C4150B6BE" +" ipv6=[2a03:4000:f:512:8475:54ff:fefe:912d]:9001" +/* nickname=Piratenpartei12 */ /* extrainfo=0 */ /* ===== */ , -"217.112.131.98 orport=9001 id=F604131DCC4303E51DB876A017A3DC9684FD626B" -/* nickname=oromis */ +"173.208.141.58 orport=8443 id=8D3BF2751B2C7857839B2E597EB9E092FB583506" +" ipv6=[2604:4300:a:5b:bad:babe:ca11:911]:8443" +/* nickname=c0rexxxkratos */ /* extrainfo=0 */ /* ===== */ , -"193.11.164.243 orport=9001 id=FFA72BD683BC2FCF988356E6BEC1E490F313FB07" -" ipv6=[2001:6b0:7:125::243]:9001" -/* nickname=Lule */ +"62.65.40.250 orport=443 id=6009023303F6881419F4CEDFC4B7FF8FFDF2E3C3" +/* nickname=a2704f1ae50d753145e */ /* extrainfo=0 */ /* ===== */ , -"139.162.232.28 orport=9001 id=86FBA753C8D25653E086B98FFF8AA084F862DB67" -" ipv6=[2a01:7e00::f03c:91ff:febb:4d59]:9001" -/* nickname=Potatoe */ +"91.143.85.52 orport=465 id=FA85FE81093FE5D53DDCEA2DBA286E8CCC9C6DDD" +" ipv6=[2a02:180:6:1::2efe]:465" +/* nickname=Planetclaire64 */ /* extrainfo=0 */ /* ===== */ , -"82.170.235.23 orport=9111 id=D4EC393C60D1A1AE39C09DF42F48664CF1DD7A36" -/* nickname=yawlimit */ +"37.218.241.28 orport=9001 id=14D2FDC6ABDCD1A27CA32D13AA2C68566D1E8223" +/* nickname=OONITestHelper */ /* extrainfo=0 */ /* ===== */ , -"85.195.235.248 orport=9001 id=103336165A0D2EFCAD3605339843A0A7710B8B92" -" ipv6=[2a02:168:a403:13:5054:ff:fe21:7c4c]:9001" -/* nickname=RelayStation */ +"163.172.94.119 orport=9001 id=E459E02374D0385D2E2515CBBE707EA208966BCF" +" ipv6=[2001:bc8:208a::1]:9050" +/* nickname=AsiaArgento */ /* extrainfo=0 */ /* ===== */ , -"89.163.128.25 orport=9001 id=AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2" -" ipv6=[2001:4ba0:ffff:237::10cc]:9001" -/* nickname=Doedel21 */ +"91.121.82.132 orport=9001 id=87D28EE0C993B250EF93DBE4D2CB0E30244D757C" +/* nickname=Hack2G2 */ /* extrainfo=0 */ /* ===== */ , -"51.75.129.204 orport=443 id=2CE9BE1FC88B9D0FA03F387C9E4F000B5D4B2AE9" -/* nickname=ridin */ +"62.210.123.24 orport=443 id=2EB3C230180694A1E848001E20F36F76A2287039" +" ipv6=[2001:bc8:30c6:100::dead]:443" +/* nickname=Alastor */ /* extrainfo=0 */ /* ===== */ , -"95.154.24.73 orport=9001 id=716EE92A2E93ED69113D8F81E98530BA9A30DC31" -" ipv6=[2001:470:1f15:770::2]:9001" -/* nickname=Air7jyl */ +"192.222.169.71 orport=9001 id=B5B666F5F7E910DFF44AD58CD62A4B3F415ECB60" +/* nickname=TORRelayCAN */ /* extrainfo=0 */ /* ===== */ , -"185.220.101.12 orport=30012 id=906DCB390F2BA987AE258D745E60BAAABAD31DE8" -" ipv6=[2a0b:f4c2::12]:20012" -/* nickname=relayon0132 */ +"95.217.30.201 orport=443 id=E7A3DA42BCA86430F089DD32C3FDA33534E76F19" +" ipv6=[2a01:4f9:c01f:30::1]:443" +/* nickname=waveguide01 */ /* extrainfo=0 */ /* ===== */ , -"108.16.117.27 orport=7936 id=3314200AC2BF60FFD828114F4A23D444834F14DB" -/* nickname=Unnamed */ +"51.159.144.243 orport=443 id=32364BEF873944BE481E8BCC7FAE9297F5F39781" +/* nickname=tirz */ /* extrainfo=0 */ /* ===== */ , -"23.105.163.117 orport=443 id=1E825573F8EFD5635E5C1E3B85CA647CFC84BA83" -/* nickname=GoodColours */ +"212.227.165.251 orport=9001 id=083C52051140DB8AF770BD40C7C8883EFFF4CAF3" +/* nickname=NAKAM */ /* extrainfo=0 */ /* ===== */ , -"140.78.100.15 orport=8443 id=70882B116C73BE323036D824315A050EE796C445" -/* nickname=INSRelay15at8443 */ +"93.95.88.13 orport=9001 id=4B1730254163346F434DE185BBA51B62D9074FC4" +" ipv6=[2a02:2780::e01a]:9001" +/* nickname=ZXSpectrum */ /* extrainfo=0 */ /* ===== */ , -"195.206.105.227 orport=13526 id=158D411B51D313456D45EF66D099585976CCDD6F" -/* nickname=RToRpi */ +"104.244.72.168 orport=9100 id=CDF6AECEA9A9092CA9859A78652AE60D359A44F6" +" ipv6=[2605:6400:30:fb03:b137:4c52:b2b1:2c98]:9100" +/* nickname=Quetzalcoatl */ /* extrainfo=0 */ /* ===== */ , -"91.208.162.203 orport=9001 id=7555DBD9732EF66F0F084C41DFDA401B6D036505" -/* nickname=gbhfmoldrelay */ +"198.73.50.66 orport=443 id=1CAFE6E87EE8BBA354DC5647C6E183D8B8AF20EC" +/* nickname=KaplanCS6 */ /* extrainfo=0 */ /* ===== */ , -"212.47.254.236 orport=443 id=C91102131E6B9CECFC56C4A29ADA4E638D7872F7" -/* nickname=torpidsFRonline1 */ +"209.141.38.62 orport=443 id=60B2A557B6B9FB8CBF8168AA93FD24D8CCE815D7" +/* nickname=ElectricSoda */ /* extrainfo=0 */ /* ===== */ , -"51.15.41.39 orport=443 id=E9BFB31EE1D7060EFAE4A52C2A148D9C4974A7C3" -" ipv6=[2001:bc8:1824:326::1]:443" -/* nickname=SpookyRooster */ +"109.236.86.109 orport=110 id=768B488AE2C61B6FA837E3AB8DB7601E1A0B8492" +" ipv6=[2a00:7c80:0:1b0:a11:90d5:be:11e5]:110" +/* nickname=eludemailrelay */ /* extrainfo=0 */ /* ===== */ , -"51.158.147.144 orport=443 id=ADBED8B751D7D63397FF3300BB3DE76141AA168F" -/* nickname=Unnamed */ +"192.42.116.161 orport=9001 id=C804BE8FB1C7C42D43C4A5E2039E77AA0FF3A8B4" +" ipv6=[2001:67c:6ec:203:192:42:116:161]:9001" +/* nickname=geefMvanjetje */ /* extrainfo=0 */ /* ===== */ , -"45.125.166.58 orport=443 id=6F1A2314C4A1ADEDFB7D419B6BB10D7BC40119F6" -/* nickname=leysen */ +"31.13.195.248 orport=443 id=7EF6E998564211FB86881FEA2627AA9119BD9842" +/* nickname=MaiaAlston */ /* extrainfo=0 */ /* ===== */ , -"45.153.160.130 orport=9001 id=D9EFB3D96A7C2E93AA7CC539086D6E1DD39455B1" -" ipv6=[2a0f:9100:110:a::82]:9001" -/* nickname=Walker */ +"37.191.195.28 orport=8443 id=BB004C7F4C5C9FAE5E001864537F89388444F572" +/* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"195.123.212.228 orport=9001 id=950134F4ABA3291EEE4E7A2F26546DB7070776A4" -" ipv6=[2a02:27ac::245]:9001" -/* nickname=FakeVolleyball */ +"23.154.177.2 orport=443 id=2A0F47CE7E1C0B7DE6FF2B3AD05DB0E77A876D98" +/* nickname=UnredactedManning */ /* extrainfo=0 */ /* ===== */ , -"198.98.57.207 orport=443 id=A00E900534DFF76371064C03714753EAF8B88820" -" ipv6=[2605:6400:10:449:d588:761:3910:8268]:443" -/* nickname=FriendlyExitNode5 */ +"51.178.26.103 orport=443 id=FFF4E4F51077370085A339B1F81A02BF3C2F52C9" +" ipv6=[2001:41d0:305:2100::8550]:443" +/* nickname=corvuscorax */ /* extrainfo=0 */ /* ===== */ , -"104.238.167.111 orport=443 id=C5BF27560E4B007365FBA96D32F9E74614218C8E" -/* nickname=stoychev */ +"51.81.56.74 orport=443 id=A1A2924158198592C3E88CB0DF23C14D9FE64328" +/* nickname=sandstorm */ /* extrainfo=0 */ /* ===== */ , -"83.97.87.182 orport=9051 id=28B39D67BD18D13694DE03679EA4A864EB6977E9" -/* nickname=th00ht */ +"195.154.133.124 orport=9001 id=288DA2F27E30BC73FC8A84367696C9DF6B4C1B90" +/* nickname=Pleiv */ /* extrainfo=0 */ /* ===== */ , -"195.154.243.182 orport=443 id=55F3D29D53F3ABB6CF2F6C2FBE8D6A1B131D0275" -/* nickname=Unnamed */ +"176.9.118.73 orport=9993 id=5F58E9417DF94A66529864FA1134635614958A44" +/* nickname=ThereIsNoCowLvl */ /* extrainfo=0 */ /* ===== */ , -"91.160.55.21 orport=9001 id=954A874584F009EB7D14D48362FF9AEF82FF6200" -" ipv6=[2a01:e0a:d:c540:4bfe:636b:b21c:42cf]:9001" -/* nickname=myNicething475b */ +"79.196.30.109 orport=9005 id=23605ADE16298CA152CC62F0C7593B3EB57BD0F4" +/* nickname=Nightosphere */ /* extrainfo=0 */ /* ===== */ , -"94.142.241.194 orport=9004 id=C03209F54BC299927CA7581147434F439F37CACB" -" ipv6=[2001:678:688:2::2]:9004" -/* nickname=VrijHeid4 */ +"24.3.110.224 orport=443 id=C542D452D42DBD01A071D2DA1CE6EE15AF40F5C2" +/* nickname=meatloaf229 */ /* extrainfo=0 */ /* ===== */ , -"144.91.125.239 orport=9001 id=525EE34C1A7B89AB9DF585246DE30E32702913F5" -/* nickname=t1r */ +"78.94.141.180 orport=15827 id=503431F94FF8FB69F10AD59DE31F3B2C3449D990" +" ipv6=[2001:470:704c::3]:15827" +/* nickname=ParckwartEfatsum */ /* extrainfo=0 */ /* ===== */ , -"94.23.194.134 orport=443 id=7E8BC43AE75EAE16D7EC4676F4A5C355F454B809" -/* nickname=minotorus */ +"45.129.3.215 orport=9002 id=A6D2C788EE9468127151A732C090674AEB0C220C" +" ipv6=[2a00:b700::8:2bb]:9001" +/* nickname=NameIsNotHere */ /* extrainfo=0 */ /* ===== */ , -"198.50.128.237 orport=9001 id=D7A80E95892AAF51FF24CF7C2CE49311931B55F7" -/* nickname=goodvikings */ +"94.212.41.237 orport=9001 id=AEB2339CC5507533E4BDF91CB53FA130A4A72DE7" +/* nickname=KoenzkTorRelay1 */ /* extrainfo=0 */ /* ===== */ , -"80.208.150.185 orport=9001 id=8A2CCF9A354EF89C08CB0AE2DD7F7E8418ADF713" -/* nickname=idideditheconfig */ +"185.100.87.250 orport=9443 id=072E2883854ADA0C6B0FC1497544E529D9FD8373" +" ipv6=[2a06:1700:0:12::1]:9443" +/* nickname=artikel10buc02 */ /* extrainfo=0 */ /* ===== */ , -"192.36.38.33 orport=443 id=54DE63F4587058B79152A75A0238D7F7A0279215" -/* nickname=uzieka */ +"50.7.178.34 orport=443 id=40FAE4540CF4C126B1B15C0F5E048FDBD66E2D88" +/* nickname=fennee */ /* extrainfo=0 */ /* ===== */ , -"107.174.244.102 orport=9001 id=22658368E5AA075AEAACC19075ADC19670A77165" -/* nickname=Assange021usX */ +"164.132.226.30 orport=22 id=0AC3C86BC9CA2A50C7762EF42ABC6D37575ACFFB" +" ipv6=[2001:41d0:401:3100::7fda]:22" +/* nickname=PieroV */ /* extrainfo=0 */ /* ===== */ , -"82.212.170.79 orport=9001 id=45DFAB9E1BD65DEF326CE0CB300E6C6F410A67F8" -/* nickname=TotorBEx */ +"193.218.118.62 orport=9001 id=FF7C2604EFEE8B5898FDE1145A4CA35C8E5E5607" +" ipv6=[2a0f:e586:f:f::62]:9001" +/* nickname=Hydra1 */ /* extrainfo=0 */ /* ===== */ , -"2.29.35.45 orport=9001 id=155513DAF42E18FA16FCE77D08417E460785A95B" -/* nickname=mac68tm */ +"140.78.100.18 orport=5443 id=B65EBC8D596BBCAD0AF6092C733C00872959FD68" +/* nickname=INSRelay18at5443 */ /* extrainfo=0 */ /* ===== */ , -"198.255.21.2 orport=443 id=6078F300B379D8DEBCF02DBE80881C94777E24BF" -/* nickname=Handlebar */ +"95.217.15.17 orport=443 id=1A10F6E2BA45CA4A5EBAA6EF759FCBF4E8AFEEA8" +" ipv6=[2a01:4f9:c010:7066::1]:443" +/* nickname=bias */ /* extrainfo=0 */ /* ===== */ , -"198.100.148.106 orport=443 id=1489CEB120B3DF9CDF1EB5152A65F8C5F4B9E0F3" -/* nickname=Unnamed */ +"107.189.28.100 orport=9100 id=EB3DA93B6FFFA699C1F2714C9E73FA813BB8F822" +" ipv6=[2605:6400:30:f052:2387:1aef:e178:b3d7]:9100" +/* nickname=Quetzalcoatl */ /* extrainfo=0 */ /* ===== */ , -"51.81.56.229 orport=443 id=A4436E70B8D7E7C5482EFCC55D53D39EC6AE905F" -/* nickname=vrienden */ +"77.21.74.43 orport=9001 id=2DACC26F1D3BA64F32EEB4185BAD696A88BA832D" +/* nickname=just1small4relay */ /* extrainfo=0 */ /* ===== */ , -"178.17.174.198 orport=443 id=8CA16E878293D11F0E0803E5FC09F93A5C666889" -/* nickname=Auroch */ +"185.220.103.117 orport=443 id=20BC2F515B5057D598CCC018705E0ECA918E0395" +/* nickname=SpeedTest2 */ /* extrainfo=0 */ /* ===== */ , -"104.200.20.46 orport=9001 id=78E2BE744A53631B4AAB781468E94C52AB73968B" -" ipv6=[2600:3c00::f03c:91ff:fee2:4963]:9001" -/* nickname=bynumlaw */ +"172.86.75.174 orport=443 id=101EEFBFCEC4869BA96C0E6AD2B6BBE696D98477" +/* nickname=JumpOverAlice */ /* extrainfo=0 */ /* ===== */ , -"150.136.244.162 orport=9000 id=934788C0B6DB4F1B6C45B1BC9E2EBBC79FFA2CEA" -/* nickname=realestRelay */ +"51.15.249.137 orport=9030 id=75FB9A4469199F251581061391214ACFDC682EF4" +/* nickname=NervousEnergy */ /* extrainfo=0 */ /* ===== */ , -"192.160.102.165 orport=9001 id=C90CA3B7FE01A146B8268D56977DC4A2C024B9EA" -" ipv6=[2620:132:300c:c01d::5]:9002" -/* nickname=cowcat */ +"96.244.79.89 orport=9001 id=ECB5CA114939B51E447792259F467C7D005C0693" +/* nickname=luigi */ /* extrainfo=0 */ /* ===== */ , -"37.221.193.44 orport=9001 id=7DA31D79E52D12685BBE8544E3C557F176B0FC84" -" ipv6=[2a03:4000:8:3c1::9001]:9001" -/* nickname=cybr */ +"213.73.96.131 orport=443 id=EE3DDF00C1ADC567F333B9BA819C8F252A32933C" +/* nickname=gina */ /* extrainfo=0 */ /* ===== */ , -"45.91.101.18 orport=9001 id=F42FF0E095F23AD253622272F984649DDEEB402C" -/* nickname=4punk7e3 */ +"132.252.186.185 orport=443 id=8ABC4D5F6182C7E79B087D1ED9E5CF652C83E52C" +" ipv6=[2001:638:501:4185:250:56ff:fe85:7034]:443" +/* nickname=UDEtor */ /* extrainfo=0 */ /* ===== */ , -"178.162.194.210 orport=80 id=BBD1B1A22695396C75DFF338A8FF7A12804A607A" -/* nickname=Blazkowicz */ +"62.212.239.170 orport=80 id=4FC02CB4A624CE730FC4BDCBF60911913C45CEBD" +/* nickname=thebolt */ /* extrainfo=0 */ /* ===== */ , -"185.173.179.18 orport=443 id=95C8B9418E74F3FF80E5C3D3AF7F03156FFBBFBE" -" ipv6=[2a0b:6900:0:1::1d7]:443" -/* nickname=rinderwahnRelay27L */ +"92.223.72.168 orport=443 id=29FFA7A881ABADCA4EEEDD16128537BB028D5153" +/* nickname=nati */ /* extrainfo=0 */ /* ===== */ , -"93.115.95.38 orport=443 id=3BB035514F8246AC367B5370F4FE120BB11D8C6D" -/* nickname=kerly */ +"51.254.136.195 orport=443 id=7BB70F8585DFC27E75D692970C0EEB0F22983A63" +/* nickname=torproxy02 */ /* extrainfo=0 */ /* ===== */ , -"68.14.177.196 orport=9001 id=83B5DB940A719B67F5BF616FEEC9D8D4F764D1AB" -/* nickname=Champions */ +"83.212.72.189 orport=443 id=661E08534FABDBE09BA505F7A73848371C6EF732" +" ipv6=[2001:648:2ffe:501:cc00:11ff:fe4b:4ba5]:443" +/* nickname=ExwMiaTigriMesaMou */ /* extrainfo=0 */ /* ===== */ , -"65.21.94.13 orport=9001 id=509EAB4C5D10C9A9A24B4EA0CE402C047A2D64E6" -" ipv6=[2a01:4f9:3b:468e::13]:9001" -/* nickname=zwiebeltoralf2 */ +"84.113.179.53 orport=9001 id=8D870EED74A4305EEAC5E8CD09F2736837367B12" +/* nickname=strainerraspi2tor */ /* extrainfo=0 */ /* ===== */ , -"46.38.254.223 orport=587 id=7AAEE1FD80A24C377FE62A7A16B5D8042DA009CF" -/* nickname=openredirect */ +"125.212.220.60 orport=443 id=CF773DE0B4F537BB80DA35643299403B7BF11AFA" +/* nickname=lader */ /* extrainfo=0 */ /* ===== */ , -"185.220.101.7 orport=20007 id=619349D82424C601CAEB94161A4CF778993DAEE7" -" ipv6=[2a0b:f4c2::7]:10007" -/* nickname=relayon0144 */ +"192.184.145.106 orport=9001 id=8B0D560D2867ADB8CD443ACABD054BEBF831F3D4" +/* nickname=piftopp */ /* extrainfo=0 */ /* ===== */ , -"104.244.73.126 orport=443 id=064D3C4CC1B854839B0979FE1C2F05ABAB7F9D68" -" ipv6=[2605:6400:30:fa6b::1]:443" -/* nickname=SanitaryLandslide */ +"104.244.72.65 orport=9001 id=F2DCADFB285DBAD7218E0EFA0598715DBAA8C18D" +/* nickname=Hydra64 */ /* extrainfo=0 */ /* ===== */ , -"179.43.160.164 orport=9001 id=FE88339058BACA3DBB947E3C10C37885A0E2F405" -/* nickname=HYS2 */ +"158.69.207.216 orport=9001 id=6565F31D9EC0C7DFFEA1920BE3BA4C73EF35B5C4" +" ipv6=[2607:5300:201:3000::dfc]:9001" +/* nickname=oscar */ /* extrainfo=0 */ /* ===== */ , -"91.245.255.4 orport=443 id=AAD6687B71EDDD12DE38DFEEA1A6B089C91F5EBC" -" ipv6=[2001:ac8:a:6:0:2:2eea:9949]:443" -/* nickname=DTFNODE32 */ +"206.217.136.47 orport=443 id=8696DC7AC0470F6ED5C7AC48030002D7D3716FC9" +/* nickname=TakTor01 */ /* extrainfo=0 */ /* ===== */ , -"171.25.193.20 orport=443 id=DD8BD7307017407FCC36F8D04A688F74A0774C02" -" ipv6=[2001:67c:289c::20]:443" -/* nickname=DFRI0 */ +"185.65.206.154 orport=443 id=3BB47BFF2788B534A5BACA37879C48EEBE5E8800" +/* nickname=laruneheureuse */ /* extrainfo=0 */ /* ===== */ , -"185.38.175.71 orport=443 id=B2380704C53947B1D72E7CBCD361E73901EF7444" -" ipv6=[2a01:4262:1ab:20::71]:9050" -/* nickname=Labitat1 */ +"142.4.213.105 orport=443 id=082A6032BD1BB3C95F8DA9F1761F56C21297B2FC" +/* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"188.68.46.245 orport=9001 id=856B7EFB7E09D02A29DD2FF024B7E1EFE21FE9EB" -" ipv6=[2a03:4000:22:175:a452:acff:fefc:987f]:9001" -/* nickname=Piratenpartei02 */ +"37.221.67.70 orport=9001 id=E9EF002E8D2911AFAB1121EF281858484F3ECA73" +/* nickname=Bastion */ /* extrainfo=0 */ /* ===== */ , -"176.123.7.102 orport=443 id=2D2DEFAF19F705EA2978E616F740B771444A4C3D" -/* nickname=RunningOnFumes5 */ +"212.47.237.127 orport=9001 id=38EF2FCFE72C49C634FE082D6CAB5D8F423B4626" +/* nickname=KonjikiNoYami */ /* extrainfo=0 */ /* ===== */ , -"45.62.210.72 orport=9001 id=30CA5BE503177D8932FB312A49505A5737D8E409" -/* nickname=nodvrelay17 */ +"54.36.108.162 orport=443 id=46F9FB943917858F618F2648595DEACD931D4400" +/* nickname=runesandrelics */ /* extrainfo=0 */ /* ===== */ , -"37.252.188.180 orport=443 id=18EA6AFA3609A0B24752FBF411A2DAADE27DE129" -" ipv6=[2a00:63c1:d:180::2]:443" -/* nickname=C3WEyeOfSauron */ +"158.255.215.41 orport=7654 id=AF2E60DEEA9971F6956A46CE0B6BC94EF558240E" +/* nickname=saturna */ /* extrainfo=0 */ /* ===== */ , -"83.243.68.194 orport=49005 id=DFCDAF8A65F523212B1E4228B61815E72614D25A" -/* nickname=thorchic */ +"157.131.206.89 orport=443 id=CF4DB0E0480FEB1E8F59C3D774EB9275283D579D" +/* nickname=GreetingsFromTheNet */ /* extrainfo=0 */ /* ===== */ , -"83.212.102.114 orport=29950 id=080BBF9B14454976FDEAD1AD620A04388F5A21F8" -" ipv6=[2001:648:2ffc:1225:a800:4ff:fe50:934c]:29950" -/* nickname=AEtherC0r3 */ +"138.201.196.156 orport=9001 id=629DE11D15B760521E1391B2D0722698FDC103DF" +" ipv6=[2a01:4f8:172:3e5b::2]:9001" +/* nickname=pilatus */ /* extrainfo=0 */ /* ===== */ , -"37.218.242.84 orport=8443 id=9737BEB02DB9FE6A89F2A022081FB7DDAC751AEB" -/* nickname=atoratvm */ +"45.61.185.90 orport=9000 id=098F98538A21A16332E8C4B724305C2A3496A467" +" ipv6=[2605:6400:40:febd:48d8:7117:124f:cc45]:9000" +/* nickname=Quetzalcoatl */ /* extrainfo=0 */ /* ===== */ , -"37.191.195.28 orport=44100 id=1D81272219B679D511930499AD8286BCD8F6C445" +"194.145.150.15 orport=443 id=326853AA78DA467E997E6040ADD0DCFF840E0CB5" +" ipv6=[2001:1578:200:10::c]:443" /* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"178.170.10.3 orport=443 id=699653E5DF094B56775275F8A4F4BFA7C5BD5E2F" -" ipv6=[2a00:c70:130:1::506]:443" -/* nickname=TRB1 */ +"95.216.115.85 orport=443 id=22BCD0DFD148209C9860C7F89907AB4DEE974A08" +/* nickname=Fastnet */ /* extrainfo=0 */ /* ===== */ , -"81.6.43.252 orport=9001 id=54A403A1B015F6E5A641AD121530966BD873136E" -" ipv6=[2a02:169:200:d::15]:9001" -/* nickname=ulula */ +"134.249.106.21 orport=9001 id=5F6B1DF8C9FA561EC11670C455A4A9188D7F96D9" +/* nickname=tr297e2 */ /* extrainfo=0 */ /* ===== */ , -"193.108.117.209 orport=443 id=7600680249A22080ECC6173FBBF64D6FCF330A61" -/* nickname=Ichotolot62 */ +"58.185.69.242 orport=8443 id=DF6F2B91C93270771C8EC92D243A7CB6234244A1" +/* nickname=orangepeel */ /* extrainfo=0 */ /* ===== */ , -"92.243.0.63 orport=9001 id=95F22A129FD1EE5BFF95218DDBA838BF6DBBDA7E" -" ipv6=[2001:4b98:dc0:41:216:3eff:fed6:a283]:9001" -/* nickname=debaze */ +"46.23.72.81 orport=443 id=7737A40305131AD8B5E60CFB9126E4BBE1ED7F76" +/* nickname=frankovich */ /* extrainfo=0 */ /* ===== */ , -"37.187.23.232 orport=80 id=F4873B3EC3325B81DC36C7E38AD3A5ED12B2F339" -/* nickname=Islay */ +"134.209.224.96 orport=443 id=736CD23D364941A7C23DE00FD21E44D16B50F388" +/* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"91.132.145.245 orport=9001 id=447A24F3402C4774D89E7AAD2D876D0BF64E3267" -" ipv6=[2a03:4000:37:76e:68f6:30ff:fe7c:a4]:9001" -/* nickname=m0rix */ +"103.228.53.155 orport=9001 id=01CB2E297A8F586DBBCF98F028A3D1A49B0AB7BA" +/* nickname=Overjump */ /* extrainfo=0 */ /* ===== */ , -"31.209.7.91 orport=9001 id=1316EE0CEBEE45E1EF4942927EC717E1AF529A68" -/* nickname=Styx */ +"213.65.114.38 orport=65187 id=AB0D440FFAE565EFCE7D0278A3E87DAE5FA29578" +/* nickname=Belgarath4TOR1 */ /* extrainfo=0 */ /* ===== */ , -"95.216.118.16 orport=4223 id=81893D8444F0C9100CCD963BD0D62BBC50121D14" -/* nickname=geekboxNEO */ +"140.78.100.29 orport=8443 id=73F34CDC592584C0519988E443E6FDFBA72C790B" +/* nickname=INSRelay29at8443 */ /* extrainfo=0 */ /* ===== */ , -"79.124.7.11 orport=443 id=B63626A3CA6F0521847853DDEC6D4044C80B903E" -/* nickname=trumaine */ +"193.108.117.59 orport=9001 id=B00B6BA943600447CF72D58DB7A35B16754E43C8" +/* nickname=MyTorNode */ /* extrainfo=0 */ /* ===== */ , -"173.249.57.253 orport=433 id=467D7417FFA611BC20227FE347494CE5F61218FB" -" ipv6=[2a02:c207:3002:8283::1]:433" -/* nickname=DjMiddle */ +"69.164.221.78 orport=443 id=E46979A3053D43ADF187463A6E4856C875BC8C89" +" ipv6=[2600:3c03::f03c:91ff:fe70:357]:443" +/* nickname=teller */ /* extrainfo=0 */ /* ===== */ , -"138.197.171.88 orport=9001 id=2E5B5397CDD7F02798F9713B2C3D85C3FEFBAFBE" -/* nickname=Unnamed */ +"188.138.33.233 orport=443 id=D80EA21626BFAE8044E4037FE765252E157E3586" +/* nickname=bonjour1 */ /* extrainfo=0 */ /* ===== */ , -"88.198.112.25 orport=9001 id=AD1FC4AE877B2FFEB3C84F1A6B76E9B057AAEF4E" -" ipv6=[2a01:4f8:c0c:53fc::1]:9050" -/* nickname=nicknametor */ +"85.214.147.9 orport=443 id=0FDC9A7D60608123CF5432F6E25C6E4BC23E7938" +/* nickname=SchweinfurtsTor2 */ /* extrainfo=0 */ /* ===== */ , -"81.17.60.24 orport=9001 id=947FFF456CFCEF5DCAB09422E1945A8D21AEEC62" -/* nickname=SPFCFutebol */ +"185.220.103.120 orport=443 id=9F0FEE115DF5A0E3F5A975378064D63EC21B4A19" +/* nickname=SpeedTest8 */ /* extrainfo=0 */ /* ===== */ , -"185.233.107.110 orport=9030 id=62274AC17DCCF4030A6AD8CEBED0C36E7B8592D8" -" ipv6=[2a03:4000:24:829::3]:9030" -/* nickname=fiedlerRelay08 */ +"37.120.190.160 orport=9001 id=C1B513BB5E15A1887B6ADCA8C010630732FC389A" +" ipv6=[2a03:4000:6:b39a::2]:9001" +/* nickname=fiedlerRelay03 */ /* extrainfo=0 */ /* ===== */ , -"37.191.195.67 orport=38443 id=E03E581AA42A211F69DC63608B1980F10AE52C26" -/* nickname=Unnamed */ +"213.164.204.90 orport=9001 id=22C1314867920DA37001DAD1A63F1D5CABF9DB11" +/* nickname=Hydra30 */ /* extrainfo=0 */ /* ===== */ , -"193.182.144.53 orport=443 id=F001CD2A9E27B7E3ECD120951CAF968213967B31" -/* nickname=Dragons */ +"83.53.71.25 orport=9001 id=AC7CF877B281BFEF34733E142C2A6F647AC57D82" +/* nickname=mitorip */ /* extrainfo=0 */ /* ===== */ , -"51.255.106.85 orport=443 id=CE8AE3563E13106A46EAD09A65AD70A5A097998F" -/* nickname=tethys */ +"51.15.85.13 orport=3158 id=07C8367E5B7D178B899578578BFC111FB4DDF2EA" +/* nickname=tdz */ /* extrainfo=0 */ /* ===== */ , -"51.159.139.61 orport=443 id=5C86A09946A49E09AD64A14636DFF91746515175" -/* nickname=tirz */ +"104.37.193.102 orport=443 id=96CAA917F65BCD62CECD236F67652BFD7C69E52E" +/* nickname=TorRelay01 */ /* extrainfo=0 */ /* ===== */ , -"71.166.42.70 orport=443 id=34133CC3192CF7538089B14511400DF21BA5A077" -/* nickname=Harambe */ +"136.49.38.118 orport=443 id=EC0ABA811E4EB33DAD8BC8B7037D862BF4F3AA28" +/* nickname=mortimerAtx */ /* extrainfo=0 */ /* ===== */ , -"95.216.19.207 orport=21 id=4D70F05DD308A2EA5B671E440879BFADAC92860F" -" ipv6=[2a01:4f9:2a:1430::2]:21" -/* nickname=arbitraryTessa1 */ +"107.189.28.100 orport=9000 id=0A76C0A0A721DDBC324B705ADBFC95FD806AE855" +" ipv6=[2605:6400:30:f052:2387:1aef:e178:b3d7]:9000" +/* nickname=Quetzalcoatl */ /* extrainfo=0 */ /* ===== */ , -"185.86.150.133 orport=443 id=1684B30AE2ADD371E5D3A8B3F28ACA4CE9CA2E00" -" ipv6=[2a02:7aa0:1619::94eb:3758]:443" -/* nickname=Unnamed */ +"151.32.131.255 orport=443 id=2B18524260FBF9DF47CABBC22E811E76B197395E" +/* nickname=torrone */ /* extrainfo=0 */ /* ===== */ , -"213.239.217.68 orport=4433 id=FFBC69467B37D6AC66598BBD295F9B0D74119ADC" -/* nickname=plan9leia */ +"114.23.164.80 orport=9001 id=CB81BCFD44FC142616BB5983648BD8AF01930789" +/* nickname=ss23voyager */ /* extrainfo=0 */ /* ===== */ , -"51.178.17.128 orport=9001 id=5DA4305BD06BD6F6A30BB06C34C251E256AC1328" -/* nickname=prrlvrRelay */ +"209.141.59.180 orport=443 id=AE5B9D83AD2D7B5C10604E457ACC5E2DD9A6D81E" +/* nickname=freedomisnotfree */ /* extrainfo=0 */ /* ===== */ , -"212.47.236.95 orport=443 id=7C5C0E83CA290FFF6D5E30D9E0E3FFC9BAE0D0C5" -" ipv6=[2001:bc8:47a0:201f::1]:443" -/* nickname=Gu1nn3zzRelay */ +"45.132.246.38 orport=9001 id=431702B3A68A6015F9955DD4FD0129175B43EA0F" +" ipv6=[2a03:4000:48:182:74dd:c1ff:fea8:d21e]:9001" +/* nickname=bituman */ /* extrainfo=0 */ /* ===== */ , -"114.23.164.80 orport=9001 id=CB81BCFD44FC142616BB5983648BD8AF01930789" -/* nickname=ss23voyager */ +"109.92.182.91 orport=9001 id=28FDCC237E83C4EF83376336DB960D11D49FA756" +/* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"179.43.156.214 orport=443 id=EDB5CB4E8609599C98F1B5C939B26B2A9BA9333B" -/* nickname=sosa */ +"172.73.184.37 orport=443 id=11AEE567D24CDE680AC78BCD6EBAC36C50B3CF49" +/* nickname=Mirage */ /* extrainfo=0 */ /* ===== */ , -"142.4.215.43 orport=443 id=C1D5B04F19B45EA0F4FA65B57DFCA265D00FD80B" -/* nickname=Unnamed */ +"95.154.25.167 orport=9001 id=AF475359500A11B48E11561CB282955DF7AA15D0" +/* nickname=ramstor1 */ /* extrainfo=0 */ /* ===== */ , -"87.168.177.66 orport=9001 id=C47A245E3B12C82CB4ABBF283E66D478CCF8E240" -/* nickname=thardes2 */ +"185.31.136.244 orport=8181 id=B2242163F681F77F93190663AC5F696ACF76C4FD" +" ipv6=[2a00:bbe0:0:221f:9eb6:54ff:fea7:1b2d]:8181" +/* nickname=torexit42 */ /* extrainfo=0 */ /* ===== */ , -"109.241.167.138 orport=9001 id=83C81FF619BE11C46F0E98B27B437154779ED6CC" -/* nickname=MorbidHenry */ +"185.220.102.254 orport=993 id=D13692D97236C0B8E8E19EA2DD952B5C4F9010BB" +" ipv6=[2a0b:f4c1:2::254]:993" +/* nickname=Digitalcourage4ip7b */ /* extrainfo=0 */ /* ===== */ , -"198.180.150.9 orport=9001 id=60E4C5E306D2DB22890EE24A09F9B6C30AF396A8" -/* nickname=rgiad */ +"40.122.165.48 orport=443 id=32C6B88EEBD4F6F5AA61F15952E8D88EAD7C67BE" +/* nickname=AnonUS00 */ /* extrainfo=0 */ /* ===== */ , -"195.154.241.145 orport=443 id=FF3D6D040641D5A33ECC8B2B57D5BC59714C4209" -/* nickname=Unnamed */ +"176.9.1.211 orport=9001 id=D123C0F8F562804693C47D68C61786023B295E98" +" ipv6=[2a01:4f8:141:31c2:5054:ff:fe00:ea09]:9001" +/* nickname=bmwanon3 */ /* extrainfo=0 */ /* ===== */ , -"178.62.251.184 orport=9001 id=69C4C2CFCF6B418636976B5FFC0140A3BE211312" -" ipv6=[2a03:b0c0:2:d0::95:9001]:9001" -/* nickname=xdefTorEvey */ +"162.212.158.82 orport=9201 id=CF8CC4763298F77FF64DAF340D26D1BBF3362C5B" +/* nickname=Assange034us2 */ /* extrainfo=0 */ /* ===== */ , -"101.100.146.147 orport=443 id=E300CEE2255A22B3DF52E798A3237D53AFAEC2F3" -/* nickname=ExplorationRelay */ +"146.59.45.119 orport=443 id=CE6A9A13BB16F845C531F72923AB5D72C2C91848" +/* nickname=morgana */ /* extrainfo=0 */ /* ===== */ , -"172.245.21.215 orport=80 id=BA0BA7A976F153DBB050266CD3D21F499FCB975D" -/* nickname=clanofxymox */ +"107.189.6.61 orport=9100 id=46BFF98FBD77441B28A345DFCF0F11F70EB4A4B9" +" ipv6=[2605:6400:30:f00f:1854:a31c:7871:2582]:9100" +/* nickname=Quetzalcoatl */ /* extrainfo=0 */ /* ===== */ , -"163.172.169.253 orport=9001 id=04A28A62F27D9C4A60F9ED0C4264E98B988C65A3" -" ipv6=[2001:bc8:47a4:e0a::1]:9001" -/* nickname=darknebula */ +"45.142.100.30 orport=443 id=A013BBF2E931A7D58A3707C84761B3F6AAAB25D5" +" ipv6=[2a10:46c0:0:2::13]:443" +/* nickname=siffeurattex */ /* extrainfo=0 */ /* ===== */ , -"179.43.169.20 orport=443 id=65E40F7EDD28E2CF28684E30E0BAB7706819CFC3" -/* nickname=Fangio */ +"178.63.172.14 orport=443 id=0A178D302936F209AF3DA77CCC4E3C4D5DBE11E9" +/* nickname=pusith */ /* extrainfo=0 */ /* ===== */ , -"109.70.100.11 orport=443 id=96E095D5CDBFC3988DEB708EC155346472402C32" -" ipv6=[2a03:e600:100::11]:443" -/* nickname=karfiol */ +"37.221.65.169 orport=8443 id=39A18F31B312E5CB211781090766934C1CFDAB36" +" ipv6=[2001:678:6d4:6010::3aed:102]:8443" +/* nickname=Aramis66 */ /* extrainfo=0 */ /* ===== */ , -"140.78.100.19 orport=8443 id=885C7B6EB943068B762070E276E299319E5AB08C" -/* nickname=INSRelay19at8443 */ +"64.44.51.37 orport=443 id=410F0781BCA296C866822A5D03A8D11F2457E78C" +" ipv6=[2602:ffc8:1:7::bad]:443" +/* nickname=torr1maiti */ /* extrainfo=0 */ /* ===== */ , -"185.117.118.15 orport=9001 id=389FBE96BA489D93AF2124EB9ABE339FC4C72F1B" -/* nickname=folo */ +"85.239.33.8 orport=9001 id=62F65E6377F0647CE0F0EE2AAE1641EC4AA2BD3B" +/* nickname=Piplup */ /* extrainfo=0 */ /* ===== */ , -"199.195.251.84 orport=9001 id=324E13FD795713BDD6E8B4DF02438742CA1FDBF1" -" ipv6=[2605:6400:10:80e::1]:9001" -/* nickname=Alina */ +"185.239.222.253 orport=443 id=7238EAB91E1050B6C6BEDDFCFD7A2440869B114A" +" ipv6=[2a09:2681:101:9001::14]:443" +/* nickname=BM14 */ /* extrainfo=0 */ /* ===== */ , -"157.131.206.89 orport=443 id=CF4DB0E0480FEB1E8F59C3D774EB9275283D579D" -/* nickname=GreetingsFromTheNet */ +"162.247.74.213 orport=443 id=84D361B736A8CD1E8818D0FC186892E91AB76881" +/* nickname=CalyxInstitute03 */ /* extrainfo=0 */ /* ===== */ , -"94.226.6.98 orport=9443 id=36EE8D47E570B8D5515460A9972F3CFD9EDFDFCE" -/* nickname=R1610091651 */ +"51.81.160.187 orport=9001 id=F4DD04C48A6CB6DB36DF6381FFB42D5BFAD97501" +/* nickname=FreedomRelay2 */ /* extrainfo=0 */ /* ===== */ , -"23.129.64.164 orport=443 id=687EFE281D08C65DE80935DEF63524EA053672B5" -" ipv6=[2620:18c:0:192::164]:443" -/* nickname=shelob */ +"109.70.100.16 orport=443 id=B1045E12FA4EA0D457A74013866CB41DC0D290BF" +" ipv6=[2a03:e600:100::16]:443" +/* nickname=broccoli */ /* extrainfo=0 */ /* ===== */ , -"98.217.124.239 orport=9001 id=BCE86415B2EC28E449D360F632647E95D08F83C9" -" ipv6=[2001:558:6017:16b:e5cc:c5c0:daaa:dd12]:9001" -/* nickname=MalfunctioningEddy */ +"104.152.209.130 orport=443 id=A4A79E2B8294AA2572B46C5C772E149F84FAF763" +/* nickname=Shebangs */ /* extrainfo=0 */ /* ===== */ , -"178.17.174.239 orport=9001 id=53C9F4954E7A7332BB0C610C5B8E04CA065AF29B" -" ipv6=[2a00:1dc0:caff:126::a5c9]:9001" -/* nickname=Aramis67 */ +"213.227.133.129 orport=443 id=94318CC2299A3826D81899EB23C25A2B7D6B1FFE" +/* nickname=byrdeman */ /* extrainfo=0 */ /* ===== */ , -"51.15.246.170 orport=443 id=C0DAAAE5EE461BBE13945FE4B52F32ABDC6BC376" -" ipv6=[2001:bc8:47b0:1756::1]:443" -/* nickname=mitsuha */ +"54.36.101.21 orport=9001 id=D9C55AC5549BF4940BE0ABBBE0E34CCC8D6D06E5" +/* nickname=ExiTOR */ /* extrainfo=0 */ /* ===== */ , -"185.220.101.19 orport=10019 id=7E281CD2C315C4F7A84BC7C8721C3BC974DDBFA3" -" ipv6=[2a0b:f4c2::19]:10019" -/* nickname=relayon0130 */ +"104.244.76.13 orport=443 id=1C0D0AF3FF05CCBBA4B6ED262196A4C5A76102E6" +/* nickname=SpongeBob */ /* extrainfo=0 */ /* ===== */ , -"192.34.58.232 orport=9004 id=4C2C62B0828413159CBD076501C7D83BD0899893" -/* nickname=ProEscort */ +"49.12.93.240 orport=443 id=602A20F90E20D1B9EA4DD87AE948B590C61F8A94" +/* nickname=skewed */ /* extrainfo=0 */ /* ===== */ , -"162.212.158.82 orport=9201 id=CF8CC4763298F77FF64DAF340D26D1BBF3362C5B" -/* nickname=Assange034us2 */ +"37.59.37.59 orport=9001 id=B7E2EBFBE4462FC908E48007517C53ED0FF752B2" +/* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"135.125.55.228 orport=443 id=B737FB6CBF7E514DD8D8B432A1497B9DBD0C45DA" -/* nickname=freedomRelay */ +"140.78.100.25 orport=8443 id=9385FF13D9E3BAB934ABCBA61EE63E10346E3673" +/* nickname=INSRelay25at8443 */ /* extrainfo=0 */ /* ===== */ , -"185.220.100.241 orport=9000 id=62F4994C6F3A5B3E590AEECE522591696C8DDEE2" -" ipv6=[2a0b:f4c0:16c:15::1]:9000" -/* nickname=F3Netze */ +"185.220.103.118 orport=9000 id=3C84D97D9846044338D6DC013A6F62A9291F4614" +/* nickname=SpeedTest5 */ /* extrainfo=0 */ /* ===== */ ,

1 0

[tor/main] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 21 Oct '21

21 Oct '21

commit 1dab1c8ad5f398b3b634d7e9a121f5ca3efcbdc8 Merge: 0135fb028c 66e8e0f71b Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 21 10:01:38 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5 changes/ticket40493 | 2 + src/app/config/fallback_dirs.inc | 951 +++++++++++++++++++-------------------- 2 files changed, 472 insertions(+), 481 deletions(-)

1 0

[tor/main] Merge branch 'maint-0.4.6'
by dgoulet＠torproject.org 21 Oct '21

21 Oct '21

commit 2f171f30c8fdcf968ea304d48c42db9fbd0efdf4 Merge: ae05f06597 d496a75026 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 21 10:01:39 2021 -0400 Merge branch 'maint-0.4.6' changes/ticket40493 | 2 + src/app/config/fallback_dirs.inc | 951 +++++++++++++++++++-------------------- 2 files changed, 472 insertions(+), 481 deletions(-)

1 0

[tor/maint-0.4.5] fallbackdir: Regenerate the list for October 2021
by dgoulet＠torproject.org 21 Oct '21

21 Oct '21

commit 66e8e0f71bfb55019b5fea1017d1be3b3dc13895 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 21 09:13:40 2021 -0400 fallbackdir: Regenerate the list for October 2021 Closes #40493 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40493 | 2 + src/app/config/fallback_dirs.inc | 951 +++++++++++++++++++-------------------- 2 files changed, 472 insertions(+), 481 deletions(-) diff --git a/changes/ticket40493 b/changes/ticket40493 new file mode 100644 index 0000000000..eb9baf916b --- /dev/null +++ b/changes/ticket40493 @@ -0,0 +1,2 @@ + o Minor features (fallbackdir): + - Regenerate fallback directories for October 2021. Close ticket 40493. diff --git a/src/app/config/fallback_dirs.inc b/src/app/config/fallback_dirs.inc index 75d01e26f8..ea1928e4c0 100644 --- a/src/app/config/fallback_dirs.inc +++ b/src/app/config/fallback_dirs.inc @@ -3,1086 +3,1075 @@ /* timestamp=20210412000000 */ /* source=offer-list */ // -// Generated on: Wed, 11 Aug 2021 12:54:23 +0000 +// Generated on: Thu, 21 Oct 2021 13:07:39 +0000 -"46.126.96.8 orport=9001 id=2C74829C382C1363812FC2BF053122A9DCF6583B" -/* nickname=ElNinoRelay */ +"62.210.105.46 orport=9001 id=ADB98B27D7A3FB5732068FD23602A1BCB3BE9F38" +/* nickname=Assange008fr */ /* extrainfo=0 */ /* ===== */ , -"85.214.141.24 orport=9001 id=BCC93B0ACA325374086A5100D02843A04EBDCC00" -" ipv6=[2a01:238:420e:ae00:1c37:63c1:24c0:ff75]:9001" -/* nickname=tor1VaxariNet */ +"95.128.43.164 orport=443 id=616081EC829593AF4232550DE6FFAA1D75B37A90" +" ipv6=[2a02:ec0:209:10::4]:443" +/* nickname=AquaRayTerminus */ /* extrainfo=0 */ /* ===== */ , -"185.76.191.83 orport=443 id=1730E41B3B004479D4EF124B5364CC34CE86F4EA" -/* nickname=x23tor83 */ +"5.79.79.133 orport=443 id=D079D6818926684C5979C18171FB18862A4A5792" +/* nickname=beerbox */ /* extrainfo=0 */ /* ===== */ , -"89.41.173.138 orport=443 id=B6942C63F1A596E6557D13FC0ACF8475A0A2AD3F" -/* nickname=owin */ +"91.121.103.117 orport=9001 id=CA53F344DB85248D69A97E900A0EC3C31AC04D25" +/* nickname=NoSuchRelay */ /* extrainfo=0 */ /* ===== */ , -"142.4.213.88 orport=443 id=552FBD8FC8E7C5AC05FC6F8C960BDAF1081413B2" -/* nickname=Unnamed */ +"109.70.100.9 orport=443 id=C8AE26D4819504D0157AD4C5DE7D5A0A7E190D10" +" ipv6=[2a03:e600:100::9]:443" +/* nickname=rucola */ /* extrainfo=0 */ /* ===== */ , -"148.251.191.252 orport=443 id=56781CCC9F6D29FEA148799AB588429C893A473C" -" ipv6=[2a01:4f8:211:d4f::2]:443" -/* nickname=scurra */ +"83.205.231.204 orport=9001 id=E05CAC929E391787077066C29461A9D22ECF0809" +/* nickname=albator */ /* extrainfo=0 */ /* ===== */ , -"51.89.143.155 orport=443 id=A932F56F69D24A96A0CBC4F32922A62DEFD28C77" -/* nickname=UenoStation55 */ +"37.252.187.111 orport=443 id=EE4AF632058F0734C1426B1AD689F47445CA2056" +" ipv6=[2a00:63c1:c:111::2]:443" +/* nickname=rinderwahnRelay7L */ /* extrainfo=0 */ /* ===== */ , -"86.80.108.228 orport=9001 id=69497036653189531207746B3D0E4ECB56888F3C" -/* nickname=octavsly */ +"144.76.157.242 orport=9001 id=00C22D3BC1822EB8EA380AF04245337399E796E2" +" ipv6=[2a01:4f8:200:30f5::103]:9001" +/* nickname=iriseden */ /* extrainfo=0 */ /* ===== */ , -"54.37.232.61 orport=443 id=973B219FDAC30873212D866568B30C44D57B32E5" -/* nickname=NikowskiThirdNode */ +"212.47.233.86 orport=9001 id=B4CAFD9CBFB34EC5DAAC146920DC7DFAFE91EA20" +" ipv6=[2001:bc8:630:194::1]:9001" +/* nickname=netimanmu */ /* extrainfo=0 */ /* ===== */ , -"185.76.191.76 orport=443 id=837528CA94748B72CE1829E4E23A7EAB232C30E6" -/* nickname=x23tor76 */ +"173.212.231.228 orport=9001 id=55403B9653A81F68C39787E000BD9F97E1F3B250" +/* nickname=StriveForFreedom */ /* extrainfo=0 */ /* ===== */ , -"45.140.170.187 orport=9001 id=A9B28E4D4FB6A26B5B6D3EDED2655D836BBD4E57" -/* nickname=Assange011ruX */ +"62.216.54.29 orport=9001 id=16824F885D72B4FA7A5090E08D877E5404BC214D" +/* nickname=guidemenow */ /* extrainfo=0 */ /* ===== */ , -"81.83.37.138 orport=9001 id=B22A56D8AE494A20CA0EB8457F3CAC54FC99ACCE" -" ipv6=[2a02:1810:38a2:d400:ba27:ebff:fec2:3e7e]:9001" -/* nickname=Unnamed */ +"213.239.213.190 orport=443 id=4E98AA295B7171996D18DD1F6A19F64AB4036B4A" +/* nickname=summalummadooma */ /* extrainfo=0 */ /* ===== */ , -"82.64.163.188 orport=9001 id=4F95B7313679ECC000F38F870CF0CF39C7386C50" -/* nickname=Ajorcel */ +"5.9.37.162 orport=9001 id=6C1A8CBE589906EEC6E73F4F286AC29AF7521E1D" +" ipv6=[2a01:4f8:161:21a9::2]:9001" +/* nickname=vahShei7Eeth */ /* extrainfo=0 */ /* ===== */ , -"104.244.73.93 orport=9000 id=6183B493ACFF41B28745CF0322E75AD7BDE4A48B" -" ipv6=[2605:6400:30:f73d:de71:a4eb:1b99:9545]:9000" -/* nickname=Quetzalcoatl */ +"82.69.47.114 orport=443 id=43E896D36AAB20B5B63094BBC52CAD4B560E47BF" +/* nickname=DeLoreanDynamite */ /* extrainfo=0 */ /* ===== */ , -"194.38.21.10 orport=9001 id=690FC3ACBBBC970309A9A0993EE12AF44C0C8E62" -/* nickname=Rowlet */ +"51.15.177.140 orport=993 id=ECD239A3B2CAD7375D218B624BCA270CDBFE2A29" +" ipv6=[2001:bc8:3fec:500:7ea::]:993" +/* nickname=Casper10 */ /* extrainfo=0 */ /* ===== */ , -"58.185.69.242 orport=8443 id=DF6F2B91C93270771C8EC92D243A7CB6234244A1" -/* nickname=orangepeel */ +"209.141.57.122 orport=443 id=051FB296CDF787B5B97A9F2C5CD6FA3E10C27045" +/* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"49.194.93.54 orport=9001 id=0D8877392F2FF5AD8D8E5BC438087F02EF97B904" -/* nickname=Starlight */ +"193.234.15.58 orport=443 id=F24F8BEA2779A79111F33F6832B062BED306B9CB" +" ipv6=[2a00:1c20:4089:1234:cdae:1b3e:cc38:3d45]:443" +/* nickname=jaures2 */ /* extrainfo=0 */ /* ===== */ , -"82.35.159.1 orport=9001 id=289F955FA04BD224F18DED9D4766529705FBDC48" -/* nickname=PixelBullyRelay */ +"185.228.138.252 orport=8080 id=91BAB54C6923454F4E5EDC59313C45002B238665" +" ipv6=[2a03:4000:23:409:748d:52ff:fe41:cdcc]:8080" +/* nickname=CryptoHouse */ /* extrainfo=0 */ /* ===== */ , -"37.157.254.37 orport=443 id=9423A72BBC8B5C6AC9DE9F57735EB2B08E4156E8" -" ipv6=[2001:4ba0:ffff:11a::3]:443" -/* nickname=TorOrDie4privacyNET */ +"77.23.45.123 orport=9001 id=5887DD4FC027A14DE4985429C38BF78C297B7795" +/* nickname=Shredder */ /* extrainfo=0 */ /* ===== */ , -"78.46.85.216 orport=9001 id=9738F8F5C386CDAF5707D0DCED428F2813CA285F" -" ipv6=[2a01:4f8:120:1381::2]:9001" -/* nickname=astolfo */ +"82.103.140.87 orport=443 id=A1B7C1F83E5DA4376FD2E1DBA7AC28A71AB332AD" +/* nickname=arnall */ /* extrainfo=0 */ /* ===== */ , -"104.244.74.28 orport=9001 id=2DB8A946826D0CB4F5C3A8264628DD0F16F6612D" -/* nickname=a9Exit */ +"37.221.66.248 orport=443 id=A28D6C0BAA9EEBD288713357C46CF6EF081EF673" +" ipv6=[2001:678:6d4:6020::4dea:105]:443" +/* nickname=DTFNODE64 */ /* extrainfo=0 */ /* ===== */ , -"142.4.213.112 orport=443 id=E12235C7310A4ABED3480E907F6D9BD1DC1E1D6C" -/* nickname=Unnamed */ +"109.70.100.1 orport=443 id=530277866466A1425F43A73DBFCB5FC7410C9852" +" ipv6=[2a03:e600:100::1]:443" +/* nickname=spargel */ /* extrainfo=0 */ /* ===== */ , -"68.196.180.5 orport=8443 id=954B2AEA8FDCF0DF701A2EC9285640B929546DF7" -/* nickname=MrRobotLives */ +"185.82.127.141 orport=9001 id=34FA04EFC21C4B8461FCE82E908FDD53DF1E7962" +/* nickname=s0menickname */ /* extrainfo=0 */ /* ===== */ , -"45.91.67.90 orport=9001 id=023DB955544865BB4D593DE66E89B496777DF0F0" -/* nickname=lavandeluxe2 */ +"45.76.218.50 orport=9001 id=1FCA426BBD7EDCC6C0FFF013D0FD9531B16A5845" +/* nickname=myTorRelay2 */ /* extrainfo=0 */ /* ===== */ , -"89.212.26.36 orport=9001 id=25A3C92EB11A140B006695D0009F6EAEAF3C6785" -/* nickname=mrrm87 */ +"54.36.205.38 orport=9001 id=5DB9AE27A44EB7B476CC04A66C67A71C97A001E6" +/* nickname=Chenjesu */ /* extrainfo=0 */ /* ===== */ , -"116.203.245.170 orport=443 id=5EB36D1BFC513A66F52A969AB23456E92D2ABB46" -" ipv6=[2a01:4f8:c2c:4582::1]:443" -/* nickname=alpha */ +"185.72.247.145 orport=9001 id=130E69E8F783DEF256E757FA78154B7DC2A39E0E" +/* nickname=funkturm */ /* extrainfo=0 */ /* ===== */ , -"185.220.101.13 orport=30013 id=48BE372CA2104D2422D49CD321060E7F697B52D9" -" ipv6=[2a0b:f4c2::13]:20013" -/* nickname=relayon0138 */ +"140.78.100.38 orport=5443 id=23D5D8219A8EB7610AB33CFAD589FD72A844356A" +/* nickname=INSRelay38at5443 */ /* extrainfo=0 */ /* ===== */ , -"37.221.198.114 orport=9001 id=FABA6394C790E96812D33689FAE90796FBA79AA8" -" ipv6=[2a03:4000:9:533::2]:9001" -/* nickname=fiedlerRelay17 */ +"173.75.39.61 orport=9001 id=023EBBC57BEB7F45473B3DC2AA811FB3AABA4466" +/* nickname=tconionrelay */ /* extrainfo=0 */ /* ===== */ , -"163.172.194.53 orport=9001 id=8C00FA7369A7A308F6A137600F0FA07990D9D451" -" ipv6=[2001:bc8:225f:142:6c69:7461:7669:73]:9001" -/* nickname=GrmmlLitavis */ +"185.4.132.135 orport=443 id=A0056E0F3773DD99C1ED298B956A2ACEE1BFB5FD" +/* nickname=Grexit */ /* extrainfo=0 */ /* ===== */ , -"185.220.100.243 orport=9100 id=E8AD8C4FDC3FE152150C005BB2EAA6A0990B74DF" -" ipv6=[2a0b:f4c0:16c:13::1]:9100" -/* nickname=F3Netze */ +"104.244.77.250 orport=443 id=E312A938D71045BE3A5C1FF3AB87CF7464194861" +" ipv6=[2605:6400:30:faa9:4abe:8b09:7ef9:18e6]:443" +/* nickname=Daenerys */ /* extrainfo=0 */ /* ===== */ , -"198.245.49.6 orport=443 id=15B434A2AC13ADE9E3F7EE6C0A740A377300F1D0" -/* nickname=Unnamed */ +"45.67.229.37 orport=9001 id=34F2DBF5595FF8323665BEC7DD8D2D28F9697B2C" +/* nickname=Pickachu */ /* extrainfo=0 */ /* ===== */ , -"78.194.37.29 orport=9001 id=625743FAF41B791AAFC2D4BF859DA4AAA2E81FE7" -/* nickname=Zion */ +"193.108.117.103 orport=9001 id=438F3EA4C9FB0DB63F5377A3271AB5435FAD7E04" +/* nickname=dolemite */ /* extrainfo=0 */ /* ===== */ , -"89.163.128.28 orport=9001 id=2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC" -" ipv6=[2001:4ba0:ffff:237::babe]:9001" -/* nickname=Doedel24 */ +"158.101.138.180 orport=443 id=B1A0F1143789466AADD5FAE5948C8138548EECEC" +" ipv6=[2603:c021:8000:d00::c1]:443" +/* nickname=KagamineLenWoRd */ /* extrainfo=0 */ /* ===== */ , -"174.127.169.233 orport=9001 id=4E9796481C1E75F75D57E8C1FC8C8ED111433316" -/* nickname=brwyatt2 */ +"110.141.223.194 orport=9001 id=1619F4FCE1C5324CAB703EAD94285B1ABE39F912" +/* nickname=PCGGRelay */ /* extrainfo=0 */ /* ===== */ , -"45.79.70.147 orport=9001 id=7DB8443AE29FBC450D34E55FA914F42BF929EE49" -" ipv6=[2600:3c01::f03c:92ff:fe97:5ebe]:9001" -/* nickname=1chandotus */ +"104.149.139.42 orport=8080 id=270EECB837AD914C01ACC777152AEEB1EBCDBDE5" +/* nickname=Phoenix */ /* extrainfo=0 */ /* ===== */ , -"51.68.173.83 orport=9001 id=1E70B9253E33D32F69B380B7C5AB0475F22DD349" -/* nickname=Unnamed */ +"58.107.88.237 orport=9001 id=0D8877392F2FF5AD8D8E5BC438087F02EF97B904" +/* nickname=Starlight */ /* extrainfo=0 */ /* ===== */ , -"104.244.79.121 orport=443 id=570520A8DB8D2BAA95A8AB438C7FB61FE9555746" -/* nickname=doukai */ +"198.245.61.171 orport=443 id=B1AE47B97B6952B3B8B2CD19B57183CF5C801348" +/* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"147.135.112.139 orport=9001 id=E0023AC14180112A2FFF00A84C6049862BB3E6C3" -/* nickname=DerrickJensen */ +"198.211.40.226 orport=9001 id=CB5700E1FB46FC98251DD8F0852B63A3B78DB830" +/* nickname=jaalkabil */ /* extrainfo=0 */ /* ===== */ , -"37.187.98.185 orport=22 id=342A1AC764D89248E66458C077CFF668D05FFF34" -" ipv6=[2001:41d0:a:22b9::1]:22" -/* nickname=aergia */ +"94.130.200.167 orport=443 id=CD39C258265B25EAA4ABA4FDCB2DF98104CAA362" +/* nickname=normaray */ /* extrainfo=0 */ /* ===== */ , -"51.75.82.166 orport=443 id=7B57933E29D520471D7E67AB48B06B62832828F9" -/* nickname=sandman1 */ +"136.243.60.188 orport=9001 id=675CFAC38BE3C9A26C3A2DD7CBC0E616F68624CA" +" ipv6=[2a01:4f8:212:1b8b:3::8]:9001" +/* nickname=mullbinde5 */ /* extrainfo=0 */ /* ===== */ , -"185.86.150.58 orport=9001 id=8E76F1F6E8499CCE975C451560586A5F8BF0BFDB" -/* nickname=JimmyBulanik */ +"81.28.206.216 orport=9001 id=BC5F00B573D277C4BFA8F0FBAA47E074D0994C1C" +/* nickname=fs0ciety */ /* extrainfo=0 */ /* ===== */ , -"91.219.236.197 orport=443 id=1D97A312D98C4D677112265659BD69A83C3AF9E4" -/* nickname=BeAnon */ +"78.198.147.227 orport=9001 id=867982ADCFBE55EC1C00A5B34C8991FF87605906" +/* nickname=roTor */ /* extrainfo=0 */ /* ===== */ , -"31.131.4.171 orport=443 id=AED4A69836630A3375845006B5AAD03BFA3F96DC" -/* nickname=1torexit */ +"23.239.113.101 orport=443 id=F98A70E5427BFF111640011F7AE31E537ECF1DD2" +/* nickname=MarinAsagi */ /* extrainfo=0 */ /* ===== */ , -"209.141.40.46 orport=443 id=68514D6AF3A500C61E5C8A03B0C1E1ADDAC62462" -/* nickname=spotyor */ +"173.212.219.49 orport=6666 id=0A5476625BAC0573A82FCB432ACED70E1ED83E93" +" ipv6=[2a02:c207:2047:1305::1]:6666" +/* nickname=OhYee */ /* extrainfo=0 */ /* ===== */ , -"2.230.193.197 orport=9003 id=A9EDB4EBF9EF5F3A129A58AE28EF92DB4B5078A3" -/* nickname=FreeTurkey */ +"52.205.15.239 orport=9001 id=87AA1BE4A39529DD86194738DFB59DC698F3136B" +/* nickname=BarryBen */ /* extrainfo=0 */ /* ===== */ , -"104.244.74.121 orport=9100 id=2EC5EE348BD8D9D2E518B2CAEA9C671E2D5F77A6" -" ipv6=[2605:6400:30:f6ed:c6a7:9997:d411:cb21]:9100" -/* nickname=Quetzalcoatl */ +"68.71.27.78 orport=9001 id=262B0B749C9088446A5521C4E98173DED815FD5A" +/* nickname=ALiteralBird */ /* extrainfo=0 */ /* ===== */ , -"152.89.104.206 orport=9001 id=DD0AA66DD9E4E71FFAFAB658DF8300F1CEEA0364" -" ipv6=[2a03:4000:39:45c:241f:53ff:fe4e:45e9]:9001" -/* nickname=flowjob04 */ +"185.162.251.135 orport=9001 id=166850D169CC7956E77525A1A9228BC4563CFC8B" +" ipv6=[2a03:4000:1a:5c5:38dc:87ff:fe07:85fb]:9001" +/* nickname=Piratenpartei10 */ /* extrainfo=0 */ /* ===== */ , -"114.108.58.201 orport=443 id=412767ECB0CEF7DCBAF8748DDBA8575860DD6782" -/* nickname=winterferien */ +"157.90.38.9 orport=443 id=42A51FFF7AB2A2F396CB924B56676F09BCB52245" +/* nickname=SoySauceR */ /* extrainfo=0 */ /* ===== */ , -"68.67.32.32 orport=9001 id=3DB72310F6999555E71A09C3FCDF86E8E99118F7" -/* nickname=hKnYTKYgoYx4JmnAwu9 */ +"217.79.178.53 orport=444 id=9C1559C46AD0279EEF6FD187E1B27D939C303086" +" ipv6=[2001:4ba0:cafe:5bf::1]:444" +/* nickname=JanKuciak */ /* extrainfo=0 */ /* ===== */ , -"107.189.30.230 orport=9001 id=B12536F2F1BBFE0B47FAAD0D5D05BFAEC6C2DE9F" -/* nickname=Hydra40 */ +"195.154.112.228 orport=9001 id=CC2DD888299ED7B7CA7D7B930352A074EBE1E906" +/* nickname=justarandomrelay */ /* extrainfo=0 */ /* ===== */ , -"51.178.26.103 orport=443 id=FFF4E4F51077370085A339B1F81A02BF3C2F52C9" -" ipv6=[2001:41d0:305:2100::8550]:443" -/* nickname=corvuscorax */ +"91.194.84.89 orport=8443 id=1AAC19D892F84910AB94C45092241ABA3CFC4C89" +" ipv6=[2001:4ba0:ffff:1ce::2]:8443" +/* nickname=ForPrivacyNET */ /* extrainfo=0 */ /* ===== */ , -"192.166.245.82 orport=443 id=8E8A46FADE96BFEA4F16CC23A25ADC05E00AE1AB" -/* nickname=DTFNODE28 */ +"159.196.69.117 orport=9001 id=B9A8969537739F89CBB02E2A91CECFE154B276C7" +/* nickname=Aurora */ /* extrainfo=0 */ /* ===== */ , -"95.217.15.17 orport=443 id=1A10F6E2BA45CA4A5EBAA6EF759FCBF4E8AFEEA8" -" ipv6=[2a01:4f9:c010:7066::1]:443" -/* nickname=bias */ +"46.38.236.250 orport=9001 id=20974D28EB668E689D4256046E0E32034375A0A2" +" ipv6=[2a03:4000:2:ba4:88e9:eff:fe89:3637]:9001" +/* nickname=cvbnet1 */ /* extrainfo=0 */ /* ===== */ , -"199.249.230.189 orport=443 id=521C30A968743B13E17E22E39BE52DA020FB92E1" -" ipv6=[2620:7:6001::189]:80" -/* nickname=Quintex100 */ +"209.141.39.200 orport=443 id=D0F40C637C5F93D823AAC497007FD07A2F0FABB5" +" ipv6=[2605:6400:20:21de::1]:443" +/* nickname=HogTheHedges */ /* extrainfo=0 */ /* ===== */ , -"109.70.100.15 orport=443 id=DE847D94E78B2E560AB87D272DC90192D3144F17" -" ipv6=[2a03:e600:100::15]:443" -/* nickname=kohlrabi */ +"5.135.156.12 orport=4899 id=5558F546D2A996DD2F4B6A62A218DF23848452E3" +/* nickname=jakfrancjamoze */ /* extrainfo=0 */ /* ===== */ , -"185.73.211.3 orport=50001 id=8699371415DC052A60BCA3AAD68E55D9B759CAE0" -" ipv6=[2a00:8dc0:aa00::13]:50001" -/* nickname=torrorist */ +"83.161.151.178 orport=9001 id=A98ADD972045D3CCAEE65C788C3F175BAEA3E324" +/* nickname=2Contribute */ /* extrainfo=0 */ /* ===== */ , -"37.187.21.49 orport=9001 id=15483893699246724B8135CC6F087767EA89A2D3" -" ipv6=[2001:41d0:a:1531::1]:9001" -/* nickname=rackhamsaltair */ +"85.214.141.24 orport=9001 id=BCC93B0ACA325374086A5100D02843A04EBDCC00" +" ipv6=[2a01:238:420e:ae00:1c37:63c1:24c0:ff75]:9001" +/* nickname=tor1VaxariNet */ /* extrainfo=0 */ /* ===== */ , -"67.3.168.113 orport=443 id=EC4B6AF202EFE752C4D9E2FBD092C4EAE779ADA1" -/* nickname=Unnamed */ +"199.195.250.77 orport=443 id=58B44B5591A96EC08114B041CC6B1BB1521DF2BE" +" ipv6=[2605:6400:10:549::1]:443" +/* nickname=UnvisitedNativity */ /* extrainfo=0 */ /* ===== */ , -"5.189.148.225 orport=9001 id=5F48BA138AC6F7B42CC7A0B0D4012541DFEB9677" -/* nickname=TrafficAdvanceNetw */ +"185.100.87.250 orport=8443 id=ABD9D46C3C026CF6B88574A0707D0BF75A067999" +" ipv6=[2a06:1700:0:12::1]:8443" +/* nickname=artikel10buc01 */ /* extrainfo=0 */ /* ===== */ , -"213.183.60.21 orport=443 id=39F91959416763AFD34DBEEC05474411B964B2DC" -" ipv6=[2a06:f904:1:100::4b]:443" -/* nickname=rinderwahnRelay11L */ +"178.20.55.16 orport=443 id=EFAE44728264982224445E96214C15F9075DEE1D" +/* nickname=marcuse1 */ /* extrainfo=0 */ /* ===== */ , -"54.38.92.43 orport=9001 id=63540827C4832D214984EA47B7A68C593F9F862F" -/* nickname=Unnamed */ +"151.237.185.134 orport=9001 id=1BBD716B4973D96E570D334A5776978BFF7E0E5D" +/* nickname=lecirque */ /* extrainfo=0 */ /* ===== */ , -"178.20.55.16 orport=443 id=EFAE44728264982224445E96214C15F9075DEE1D" -/* nickname=marcuse1 */ +"213.164.218.224 orport=443 id=3C7F402F5C62A96C7E0DCD5CC850AADF88393802" +/* nickname=Chani */ /* extrainfo=0 */ /* ===== */ , -"37.187.102.108 orport=443 id=F4263275CF54A6836EE7BD527B1328836A6F06E1" -" ipv6=[2001:41d0:a:266c::1]:443" -/* nickname=EvilMoe */ +"51.83.131.42 orport=9001 id=8F293A6484A0973167B15C4997AB9F24C21143FE" +/* nickname=Hydra24 */ /* extrainfo=0 */ /* ===== */ , -"51.15.65.243 orport=443 id=9B5ED3370E002AEBB2A9B25E3213C1817CCD2D88" -" ipv6=[2001:bc8:1830:180b::1]:443" -/* nickname=fleischgewehr */ +"172.105.89.143 orport=9007 id=26C15ED5282382A843D0774F5170BCCCCCC46D63" +" ipv6=[2a01:7e01::f03c:92ff:fe7c:85f7]:9007" +/* nickname=BestofbestBackup */ /* extrainfo=0 */ /* ===== */ , -"188.126.83.38 orport=443 id=E0A3471C24C9021CC58FBF774203046FD2BC893F" -/* nickname=redsox */ +"179.43.169.20 orport=443 id=65E40F7EDD28E2CF28684E30E0BAB7706819CFC3" +/* nickname=Fangio */ /* extrainfo=0 */ /* ===== */ , -"151.115.56.33 orport=443 id=91094CEBDA0C921923EA4213A209B14216F09AC1" -/* nickname=ENC2WAW1984 */ +"174.89.83.82 orport=9001 id=C8705CB63A3D3060A649D9FA0514E7E60A1E1A2B" +/* nickname=metM0r */ /* extrainfo=0 */ /* ===== */ , -"185.220.101.137 orport=10210 id=28F4F392F8F19E3FBDE09616D9DB8143A1E2DDD3" -" ipv6=[2a0b:f4c2:1::137]:10210" -/* nickname=relayon0210 */ +"68.160.242.214 orport=9001 id=6111C6005AB56498BE5E35666B2522CEBE17D14E" +/* nickname=jsRelay */ /* extrainfo=0 */ /* ===== */ , -"46.194.163.28 orport=65534 id=7BE9E2EF2BB41BB662D9A3CD68289B9E3DBF8A08" -/* nickname=WYSWYG */ +"144.76.216.252 orport=9001 id=6B88E20FEE8EB47F1A8E30207F327005C61A013D" +" ipv6=[2a01:4f8:200:8261::b0]:9001" +/* nickname=slacknet */ /* extrainfo=0 */ /* ===== */ , -"85.214.196.178 orport=9001 id=EAD250EE6D1BDB1BBACFFD1C3C262D59FD55A41A" -" ipv6=[2a01:238:4306:cf00:ec59:d2a4:ac11:336]:9050" -/* nickname=Zwiebelring */ +"209.141.54.168 orport=443 id=A66E5782FE6097D2824044466776FE912AEFD85B" +" ipv6=[2605:6400:20:274::1]:443" +/* nickname=alxu2 */ /* extrainfo=0 */ /* ===== */ , -"23.129.64.133 orport=443 id=FC773D88785CF34CF0028BA13C5CBD32CAB27AE2" -" ipv6=[2620:18c:0:192::133]:443" -/* nickname=undervillian */ +"107.189.31.241 orport=9100 id=82CE42D04B5BA616E611E4758861C864B2ACFCA8" +" ipv6=[2605:6400:30:f02a:faff:1d57:32b7:157f]:9100" +/* nickname=Quetzalcoatl */ /* extrainfo=0 */ /* ===== */ , -"185.220.101.14 orport=10014 id=957354D72042719C310A907FBFE42A3232C78757" -" ipv6=[2a0b:f4c2::14]:10014" -/* nickname=relayon0142 */ +"123.255.62.137 orport=9001 id=803FB98BA0FE1709C087E9138CC6096F22083CA5" +/* nickname=Damnation */ /* extrainfo=0 */ /* ===== */ , -"188.127.226.102 orport=110 id=B05B3AB0159238FB7AEB1BF08A406D6F31A45ADF" -" ipv6=[2a06:dd00:1:12:a11:90d5:be:11e5]:110" -/* nickname=eludemailrelay */ +"5.56.221.113 orport=4020 id=605EE4375EE4C38215C8949F5808863749FD4F4A" +/* nickname=arcanum */ /* extrainfo=0 */ /* ===== */ , -"45.33.46.101 orport=9001 id=07623013C3361FE566B71C8CFCC6483D7587A827" -/* nickname=FreedomFries01 */ +"24.151.37.55 orport=42069 id=343EC037D633150AFFCC8471E805AABAE1B1D871" +/* nickname=BringMeToLife */ /* extrainfo=0 */ /* ===== */ , -"116.203.23.183 orport=9001 id=5D377009B7538DE1423C4FBEB82370040394A9FF" -" ipv6=[2a01:4f8:c0c:ae0c::1]:9001" -/* nickname=SCSYSTEMSRELAY01 */ +"212.74.233.22 orport=9011 id=66B06D59BDFC90EBC6EDE79C558275F2CD4799B0" +/* nickname=daytoner */ /* extrainfo=0 */ /* ===== */ , -"140.78.100.43 orport=8443 id=BC6E80744314F16054A64EE0F2302F082C929958" -/* nickname=INSRelay43at8443 */ +"185.32.221.201 orport=443 id=03DC081E4409631006EFCD3AF13AFAAF2B553FFC" +/* nickname=krigernes */ /* extrainfo=0 */ /* ===== */ , -"78.46.202.212 orport=9010 id=28D20B990E48FCA20857DBDF12997C323C125124" -" ipv6=[2a01:4f8:c0c:162b::1]:9010" -/* nickname=dvbhorst */ +"199.249.230.166 orport=443 id=1BBCAEB763CA46DEB565A7251FAA6AC79A388ADD" +" ipv6=[2620:7:6001::166]:80" +/* nickname=Quintex77 */ /* extrainfo=0 */ /* ===== */ , -"80.100.69.97 orport=9001 id=19083549B3F2BFD96FAACA934D7872CD578A8B99" -/* nickname=raspitor3 */ +"92.38.163.65 orport=9001 id=C8AAADD3FD1470E7D60D8BC4500F95825F35057D" +" ipv6=[2a03:90c0:83:2908::169]:443" +/* nickname=Lux4 */ /* extrainfo=0 */ /* ===== */ , -"89.163.128.26 orport=9001 id=8FA37B93397015B2BC5A525C908485260BE9F422" -" ipv6=[2001:4ba0:ffff:237::abba]:9001" -/* nickname=Doedel22 */ +"193.111.26.37 orport=443 id=C9D02B1644BD47C136E379FDFAF4973D1A1CE07C" +/* nickname=8af34cb1 */ /* extrainfo=0 */ /* ===== */ , -"38.39.192.78 orport=443 id=A96DA63E4415E776FBFCCF3DA7154C804534B6E7" -/* nickname=3735928559 */ +"132.226.162.148 orport=9001 id=45047C78E1F5E7B775B0A42F118D4ED64504D09E" +" ipv6=[2603:c021:c003:3511:1::]:9001" +/* nickname=plithismos */ /* extrainfo=0 */ /* ===== */ , -"201.114.166.24 orport=9001 id=C0417071C3754885296F4A5935AC1BC1CABDBC31" -/* nickname=toritoinfinito */ +"185.220.102.250 orport=993 id=35B503FB546815CC9EDE91022555B5D0ED04E389" +" ipv6=[2a0b:f4c1:2::250]:993" +/* nickname=Digitalcourage4ip3b */ /* extrainfo=0 */ /* ===== */ , -"52.214.94.163 orport=9001 id=430672CD7162FA88AB49D891C38567799F346333" -/* nickname=Isidore */ +"95.216.145.127 orport=9001 id=5EF0AAAEEE7B1282DA0DBAB94669B73E39DD51B6" +/* nickname=MyCoolNick */ /* extrainfo=0 */ /* ===== */ , -"195.176.3.24 orport=8443 id=8C25BA134D579B8AAF420E01215EB2CF06AAE907" -" ipv6=[2001:620:20d0::24]:8443" -/* nickname=DigiGesTor5e4 */ +"84.160.69.190 orport=9001 id=1388AB40396F57ED95BB6036E6504CE8E0F622B8" +/* nickname=BurnerMeetsTOR */ /* extrainfo=0 */ /* ===== */ , -"37.191.195.28 orport=8443 id=BB004C7F4C5C9FAE5E001864537F89388444F572" -/* nickname=Unnamed */ +"178.17.173.26 orport=9001 id=7332A06B00D6AF54AA804F03C624DFBBC9E66172" +" ipv6=[2a00:1dc0:2451:10::3]:9001" +/* nickname=MoldEraTor */ /* extrainfo=0 */ /* ===== */ , -"72.132.134.217 orport=443 id=188FC071EBD1901AFEAFC68603C63D43F989709F" -/* nickname=anomaly */ +"172.222.102.43 orport=9001 id=C8A8423DDB3C7E62D0F2A7A88B09BA68710B6AF2" +/* nickname=margate */ /* extrainfo=0 */ /* ===== */ , -"104.178.168.242 orport=9001 id=AB6072166366C2E245F95905310431357B581F9C" -" ipv6=[2600:1700:c0:5678::9001]:9001" -/* nickname=AaronSwartz */ +"5.45.104.171 orport=22 id=D30734EC319A37E15155F6B710E9CC8F987FC772" +" ipv6=[2a03:4000:6:1547:92dc:911c:7899:e0f2]:22" +/* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"45.14.233.160 orport=443 id=DDC3D816F2B229CEFF613E4D912CD79EE34024EF" -" ipv6=[2a0e:1580:1000::2dff:fe0e:e9a0]:443" -/* nickname=mikrogravitation03 */ +"37.120.184.36 orport=9001 id=A7317673B923B591066204FFD299AB2C4150B6BE" +" ipv6=[2a03:4000:f:512:8475:54ff:fefe:912d]:9001" +/* nickname=Piratenpartei12 */ /* extrainfo=0 */ /* ===== */ , -"217.112.131.98 orport=9001 id=F604131DCC4303E51DB876A017A3DC9684FD626B" -/* nickname=oromis */ +"173.208.141.58 orport=8443 id=8D3BF2751B2C7857839B2E597EB9E092FB583506" +" ipv6=[2604:4300:a:5b:bad:babe:ca11:911]:8443" +/* nickname=c0rexxxkratos */ /* extrainfo=0 */ /* ===== */ , -"193.11.164.243 orport=9001 id=FFA72BD683BC2FCF988356E6BEC1E490F313FB07" -" ipv6=[2001:6b0:7:125::243]:9001" -/* nickname=Lule */ +"62.65.40.250 orport=443 id=6009023303F6881419F4CEDFC4B7FF8FFDF2E3C3" +/* nickname=a2704f1ae50d753145e */ /* extrainfo=0 */ /* ===== */ , -"139.162.232.28 orport=9001 id=86FBA753C8D25653E086B98FFF8AA084F862DB67" -" ipv6=[2a01:7e00::f03c:91ff:febb:4d59]:9001" -/* nickname=Potatoe */ +"91.143.85.52 orport=465 id=FA85FE81093FE5D53DDCEA2DBA286E8CCC9C6DDD" +" ipv6=[2a02:180:6:1::2efe]:465" +/* nickname=Planetclaire64 */ /* extrainfo=0 */ /* ===== */ , -"82.170.235.23 orport=9111 id=D4EC393C60D1A1AE39C09DF42F48664CF1DD7A36" -/* nickname=yawlimit */ +"37.218.241.28 orport=9001 id=14D2FDC6ABDCD1A27CA32D13AA2C68566D1E8223" +/* nickname=OONITestHelper */ /* extrainfo=0 */ /* ===== */ , -"85.195.235.248 orport=9001 id=103336165A0D2EFCAD3605339843A0A7710B8B92" -" ipv6=[2a02:168:a403:13:5054:ff:fe21:7c4c]:9001" -/* nickname=RelayStation */ +"163.172.94.119 orport=9001 id=E459E02374D0385D2E2515CBBE707EA208966BCF" +" ipv6=[2001:bc8:208a::1]:9050" +/* nickname=AsiaArgento */ /* extrainfo=0 */ /* ===== */ , -"89.163.128.25 orport=9001 id=AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2" -" ipv6=[2001:4ba0:ffff:237::10cc]:9001" -/* nickname=Doedel21 */ +"91.121.82.132 orport=9001 id=87D28EE0C993B250EF93DBE4D2CB0E30244D757C" +/* nickname=Hack2G2 */ /* extrainfo=0 */ /* ===== */ , -"51.75.129.204 orport=443 id=2CE9BE1FC88B9D0FA03F387C9E4F000B5D4B2AE9" -/* nickname=ridin */ +"62.210.123.24 orport=443 id=2EB3C230180694A1E848001E20F36F76A2287039" +" ipv6=[2001:bc8:30c6:100::dead]:443" +/* nickname=Alastor */ /* extrainfo=0 */ /* ===== */ , -"95.154.24.73 orport=9001 id=716EE92A2E93ED69113D8F81E98530BA9A30DC31" -" ipv6=[2001:470:1f15:770::2]:9001" -/* nickname=Air7jyl */ +"192.222.169.71 orport=9001 id=B5B666F5F7E910DFF44AD58CD62A4B3F415ECB60" +/* nickname=TORRelayCAN */ /* extrainfo=0 */ /* ===== */ , -"185.220.101.12 orport=30012 id=906DCB390F2BA987AE258D745E60BAAABAD31DE8" -" ipv6=[2a0b:f4c2::12]:20012" -/* nickname=relayon0132 */ +"95.217.30.201 orport=443 id=E7A3DA42BCA86430F089DD32C3FDA33534E76F19" +" ipv6=[2a01:4f9:c01f:30::1]:443" +/* nickname=waveguide01 */ /* extrainfo=0 */ /* ===== */ , -"108.16.117.27 orport=7936 id=3314200AC2BF60FFD828114F4A23D444834F14DB" -/* nickname=Unnamed */ +"51.159.144.243 orport=443 id=32364BEF873944BE481E8BCC7FAE9297F5F39781" +/* nickname=tirz */ /* extrainfo=0 */ /* ===== */ , -"23.105.163.117 orport=443 id=1E825573F8EFD5635E5C1E3B85CA647CFC84BA83" -/* nickname=GoodColours */ +"212.227.165.251 orport=9001 id=083C52051140DB8AF770BD40C7C8883EFFF4CAF3" +/* nickname=NAKAM */ /* extrainfo=0 */ /* ===== */ , -"140.78.100.15 orport=8443 id=70882B116C73BE323036D824315A050EE796C445" -/* nickname=INSRelay15at8443 */ +"93.95.88.13 orport=9001 id=4B1730254163346F434DE185BBA51B62D9074FC4" +" ipv6=[2a02:2780::e01a]:9001" +/* nickname=ZXSpectrum */ /* extrainfo=0 */ /* ===== */ , -"195.206.105.227 orport=13526 id=158D411B51D313456D45EF66D099585976CCDD6F" -/* nickname=RToRpi */ +"104.244.72.168 orport=9100 id=CDF6AECEA9A9092CA9859A78652AE60D359A44F6" +" ipv6=[2605:6400:30:fb03:b137:4c52:b2b1:2c98]:9100" +/* nickname=Quetzalcoatl */ /* extrainfo=0 */ /* ===== */ , -"91.208.162.203 orport=9001 id=7555DBD9732EF66F0F084C41DFDA401B6D036505" -/* nickname=gbhfmoldrelay */ +"198.73.50.66 orport=443 id=1CAFE6E87EE8BBA354DC5647C6E183D8B8AF20EC" +/* nickname=KaplanCS6 */ /* extrainfo=0 */ /* ===== */ , -"212.47.254.236 orport=443 id=C91102131E6B9CECFC56C4A29ADA4E638D7872F7" -/* nickname=torpidsFRonline1 */ +"209.141.38.62 orport=443 id=60B2A557B6B9FB8CBF8168AA93FD24D8CCE815D7" +/* nickname=ElectricSoda */ /* extrainfo=0 */ /* ===== */ , -"51.15.41.39 orport=443 id=E9BFB31EE1D7060EFAE4A52C2A148D9C4974A7C3" -" ipv6=[2001:bc8:1824:326::1]:443" -/* nickname=SpookyRooster */ +"109.236.86.109 orport=110 id=768B488AE2C61B6FA837E3AB8DB7601E1A0B8492" +" ipv6=[2a00:7c80:0:1b0:a11:90d5:be:11e5]:110" +/* nickname=eludemailrelay */ /* extrainfo=0 */ /* ===== */ , -"51.158.147.144 orport=443 id=ADBED8B751D7D63397FF3300BB3DE76141AA168F" -/* nickname=Unnamed */ +"192.42.116.161 orport=9001 id=C804BE8FB1C7C42D43C4A5E2039E77AA0FF3A8B4" +" ipv6=[2001:67c:6ec:203:192:42:116:161]:9001" +/* nickname=geefMvanjetje */ /* extrainfo=0 */ /* ===== */ , -"45.125.166.58 orport=443 id=6F1A2314C4A1ADEDFB7D419B6BB10D7BC40119F6" -/* nickname=leysen */ +"31.13.195.248 orport=443 id=7EF6E998564211FB86881FEA2627AA9119BD9842" +/* nickname=MaiaAlston */ /* extrainfo=0 */ /* ===== */ , -"45.153.160.130 orport=9001 id=D9EFB3D96A7C2E93AA7CC539086D6E1DD39455B1" -" ipv6=[2a0f:9100:110:a::82]:9001" -/* nickname=Walker */ +"37.191.195.28 orport=8443 id=BB004C7F4C5C9FAE5E001864537F89388444F572" +/* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"195.123.212.228 orport=9001 id=950134F4ABA3291EEE4E7A2F26546DB7070776A4" -" ipv6=[2a02:27ac::245]:9001" -/* nickname=FakeVolleyball */ +"23.154.177.2 orport=443 id=2A0F47CE7E1C0B7DE6FF2B3AD05DB0E77A876D98" +/* nickname=UnredactedManning */ /* extrainfo=0 */ /* ===== */ , -"198.98.57.207 orport=443 id=A00E900534DFF76371064C03714753EAF8B88820" -" ipv6=[2605:6400:10:449:d588:761:3910:8268]:443" -/* nickname=FriendlyExitNode5 */ +"51.178.26.103 orport=443 id=FFF4E4F51077370085A339B1F81A02BF3C2F52C9" +" ipv6=[2001:41d0:305:2100::8550]:443" +/* nickname=corvuscorax */ /* extrainfo=0 */ /* ===== */ , -"104.238.167.111 orport=443 id=C5BF27560E4B007365FBA96D32F9E74614218C8E" -/* nickname=stoychev */ +"51.81.56.74 orport=443 id=A1A2924158198592C3E88CB0DF23C14D9FE64328" +/* nickname=sandstorm */ /* extrainfo=0 */ /* ===== */ , -"83.97.87.182 orport=9051 id=28B39D67BD18D13694DE03679EA4A864EB6977E9" -/* nickname=th00ht */ +"195.154.133.124 orport=9001 id=288DA2F27E30BC73FC8A84367696C9DF6B4C1B90" +/* nickname=Pleiv */ /* extrainfo=0 */ /* ===== */ , -"195.154.243.182 orport=443 id=55F3D29D53F3ABB6CF2F6C2FBE8D6A1B131D0275" -/* nickname=Unnamed */ +"176.9.118.73 orport=9993 id=5F58E9417DF94A66529864FA1134635614958A44" +/* nickname=ThereIsNoCowLvl */ /* extrainfo=0 */ /* ===== */ , -"91.160.55.21 orport=9001 id=954A874584F009EB7D14D48362FF9AEF82FF6200" -" ipv6=[2a01:e0a:d:c540:4bfe:636b:b21c:42cf]:9001" -/* nickname=myNicething475b */ +"79.196.30.109 orport=9005 id=23605ADE16298CA152CC62F0C7593B3EB57BD0F4" +/* nickname=Nightosphere */ /* extrainfo=0 */ /* ===== */ , -"94.142.241.194 orport=9004 id=C03209F54BC299927CA7581147434F439F37CACB" -" ipv6=[2001:678:688:2::2]:9004" -/* nickname=VrijHeid4 */ +"24.3.110.224 orport=443 id=C542D452D42DBD01A071D2DA1CE6EE15AF40F5C2" +/* nickname=meatloaf229 */ /* extrainfo=0 */ /* ===== */ , -"144.91.125.239 orport=9001 id=525EE34C1A7B89AB9DF585246DE30E32702913F5" -/* nickname=t1r */ +"78.94.141.180 orport=15827 id=503431F94FF8FB69F10AD59DE31F3B2C3449D990" +" ipv6=[2001:470:704c::3]:15827" +/* nickname=ParckwartEfatsum */ /* extrainfo=0 */ /* ===== */ , -"94.23.194.134 orport=443 id=7E8BC43AE75EAE16D7EC4676F4A5C355F454B809" -/* nickname=minotorus */ +"45.129.3.215 orport=9002 id=A6D2C788EE9468127151A732C090674AEB0C220C" +" ipv6=[2a00:b700::8:2bb]:9001" +/* nickname=NameIsNotHere */ /* extrainfo=0 */ /* ===== */ , -"198.50.128.237 orport=9001 id=D7A80E95892AAF51FF24CF7C2CE49311931B55F7" -/* nickname=goodvikings */ +"94.212.41.237 orport=9001 id=AEB2339CC5507533E4BDF91CB53FA130A4A72DE7" +/* nickname=KoenzkTorRelay1 */ /* extrainfo=0 */ /* ===== */ , -"80.208.150.185 orport=9001 id=8A2CCF9A354EF89C08CB0AE2DD7F7E8418ADF713" -/* nickname=idideditheconfig */ +"185.100.87.250 orport=9443 id=072E2883854ADA0C6B0FC1497544E529D9FD8373" +" ipv6=[2a06:1700:0:12::1]:9443" +/* nickname=artikel10buc02 */ /* extrainfo=0 */ /* ===== */ , -"192.36.38.33 orport=443 id=54DE63F4587058B79152A75A0238D7F7A0279215" -/* nickname=uzieka */ +"50.7.178.34 orport=443 id=40FAE4540CF4C126B1B15C0F5E048FDBD66E2D88" +/* nickname=fennee */ /* extrainfo=0 */ /* ===== */ , -"107.174.244.102 orport=9001 id=22658368E5AA075AEAACC19075ADC19670A77165" -/* nickname=Assange021usX */ +"164.132.226.30 orport=22 id=0AC3C86BC9CA2A50C7762EF42ABC6D37575ACFFB" +" ipv6=[2001:41d0:401:3100::7fda]:22" +/* nickname=PieroV */ /* extrainfo=0 */ /* ===== */ , -"82.212.170.79 orport=9001 id=45DFAB9E1BD65DEF326CE0CB300E6C6F410A67F8" -/* nickname=TotorBEx */ +"193.218.118.62 orport=9001 id=FF7C2604EFEE8B5898FDE1145A4CA35C8E5E5607" +" ipv6=[2a0f:e586:f:f::62]:9001" +/* nickname=Hydra1 */ /* extrainfo=0 */ /* ===== */ , -"2.29.35.45 orport=9001 id=155513DAF42E18FA16FCE77D08417E460785A95B" -/* nickname=mac68tm */ +"140.78.100.18 orport=5443 id=B65EBC8D596BBCAD0AF6092C733C00872959FD68" +/* nickname=INSRelay18at5443 */ /* extrainfo=0 */ /* ===== */ , -"198.255.21.2 orport=443 id=6078F300B379D8DEBCF02DBE80881C94777E24BF" -/* nickname=Handlebar */ +"95.217.15.17 orport=443 id=1A10F6E2BA45CA4A5EBAA6EF759FCBF4E8AFEEA8" +" ipv6=[2a01:4f9:c010:7066::1]:443" +/* nickname=bias */ /* extrainfo=0 */ /* ===== */ , -"198.100.148.106 orport=443 id=1489CEB120B3DF9CDF1EB5152A65F8C5F4B9E0F3" -/* nickname=Unnamed */ +"107.189.28.100 orport=9100 id=EB3DA93B6FFFA699C1F2714C9E73FA813BB8F822" +" ipv6=[2605:6400:30:f052:2387:1aef:e178:b3d7]:9100" +/* nickname=Quetzalcoatl */ /* extrainfo=0 */ /* ===== */ , -"51.81.56.229 orport=443 id=A4436E70B8D7E7C5482EFCC55D53D39EC6AE905F" -/* nickname=vrienden */ +"77.21.74.43 orport=9001 id=2DACC26F1D3BA64F32EEB4185BAD696A88BA832D" +/* nickname=just1small4relay */ /* extrainfo=0 */ /* ===== */ , -"178.17.174.198 orport=443 id=8CA16E878293D11F0E0803E5FC09F93A5C666889" -/* nickname=Auroch */ +"185.220.103.117 orport=443 id=20BC2F515B5057D598CCC018705E0ECA918E0395" +/* nickname=SpeedTest2 */ /* extrainfo=0 */ /* ===== */ , -"104.200.20.46 orport=9001 id=78E2BE744A53631B4AAB781468E94C52AB73968B" -" ipv6=[2600:3c00::f03c:91ff:fee2:4963]:9001" -/* nickname=bynumlaw */ +"172.86.75.174 orport=443 id=101EEFBFCEC4869BA96C0E6AD2B6BBE696D98477" +/* nickname=JumpOverAlice */ /* extrainfo=0 */ /* ===== */ , -"150.136.244.162 orport=9000 id=934788C0B6DB4F1B6C45B1BC9E2EBBC79FFA2CEA" -/* nickname=realestRelay */ +"51.15.249.137 orport=9030 id=75FB9A4469199F251581061391214ACFDC682EF4" +/* nickname=NervousEnergy */ /* extrainfo=0 */ /* ===== */ , -"192.160.102.165 orport=9001 id=C90CA3B7FE01A146B8268D56977DC4A2C024B9EA" -" ipv6=[2620:132:300c:c01d::5]:9002" -/* nickname=cowcat */ +"96.244.79.89 orport=9001 id=ECB5CA114939B51E447792259F467C7D005C0693" +/* nickname=luigi */ /* extrainfo=0 */ /* ===== */ , -"37.221.193.44 orport=9001 id=7DA31D79E52D12685BBE8544E3C557F176B0FC84" -" ipv6=[2a03:4000:8:3c1::9001]:9001" -/* nickname=cybr */ +"213.73.96.131 orport=443 id=EE3DDF00C1ADC567F333B9BA819C8F252A32933C" +/* nickname=gina */ /* extrainfo=0 */ /* ===== */ , -"45.91.101.18 orport=9001 id=F42FF0E095F23AD253622272F984649DDEEB402C" -/* nickname=4punk7e3 */ +"132.252.186.185 orport=443 id=8ABC4D5F6182C7E79B087D1ED9E5CF652C83E52C" +" ipv6=[2001:638:501:4185:250:56ff:fe85:7034]:443" +/* nickname=UDEtor */ /* extrainfo=0 */ /* ===== */ , -"178.162.194.210 orport=80 id=BBD1B1A22695396C75DFF338A8FF7A12804A607A" -/* nickname=Blazkowicz */ +"62.212.239.170 orport=80 id=4FC02CB4A624CE730FC4BDCBF60911913C45CEBD" +/* nickname=thebolt */ /* extrainfo=0 */ /* ===== */ , -"185.173.179.18 orport=443 id=95C8B9418E74F3FF80E5C3D3AF7F03156FFBBFBE" -" ipv6=[2a0b:6900:0:1::1d7]:443" -/* nickname=rinderwahnRelay27L */ +"92.223.72.168 orport=443 id=29FFA7A881ABADCA4EEEDD16128537BB028D5153" +/* nickname=nati */ /* extrainfo=0 */ /* ===== */ , -"93.115.95.38 orport=443 id=3BB035514F8246AC367B5370F4FE120BB11D8C6D" -/* nickname=kerly */ +"51.254.136.195 orport=443 id=7BB70F8585DFC27E75D692970C0EEB0F22983A63" +/* nickname=torproxy02 */ /* extrainfo=0 */ /* ===== */ , -"68.14.177.196 orport=9001 id=83B5DB940A719B67F5BF616FEEC9D8D4F764D1AB" -/* nickname=Champions */ +"83.212.72.189 orport=443 id=661E08534FABDBE09BA505F7A73848371C6EF732" +" ipv6=[2001:648:2ffe:501:cc00:11ff:fe4b:4ba5]:443" +/* nickname=ExwMiaTigriMesaMou */ /* extrainfo=0 */ /* ===== */ , -"65.21.94.13 orport=9001 id=509EAB4C5D10C9A9A24B4EA0CE402C047A2D64E6" -" ipv6=[2a01:4f9:3b:468e::13]:9001" -/* nickname=zwiebeltoralf2 */ +"84.113.179.53 orport=9001 id=8D870EED74A4305EEAC5E8CD09F2736837367B12" +/* nickname=strainerraspi2tor */ /* extrainfo=0 */ /* ===== */ , -"46.38.254.223 orport=587 id=7AAEE1FD80A24C377FE62A7A16B5D8042DA009CF" -/* nickname=openredirect */ +"125.212.220.60 orport=443 id=CF773DE0B4F537BB80DA35643299403B7BF11AFA" +/* nickname=lader */ /* extrainfo=0 */ /* ===== */ , -"185.220.101.7 orport=20007 id=619349D82424C601CAEB94161A4CF778993DAEE7" -" ipv6=[2a0b:f4c2::7]:10007" -/* nickname=relayon0144 */ +"192.184.145.106 orport=9001 id=8B0D560D2867ADB8CD443ACABD054BEBF831F3D4" +/* nickname=piftopp */ /* extrainfo=0 */ /* ===== */ , -"104.244.73.126 orport=443 id=064D3C4CC1B854839B0979FE1C2F05ABAB7F9D68" -" ipv6=[2605:6400:30:fa6b::1]:443" -/* nickname=SanitaryLandslide */ +"104.244.72.65 orport=9001 id=F2DCADFB285DBAD7218E0EFA0598715DBAA8C18D" +/* nickname=Hydra64 */ /* extrainfo=0 */ /* ===== */ , -"179.43.160.164 orport=9001 id=FE88339058BACA3DBB947E3C10C37885A0E2F405" -/* nickname=HYS2 */ +"158.69.207.216 orport=9001 id=6565F31D9EC0C7DFFEA1920BE3BA4C73EF35B5C4" +" ipv6=[2607:5300:201:3000::dfc]:9001" +/* nickname=oscar */ /* extrainfo=0 */ /* ===== */ , -"91.245.255.4 orport=443 id=AAD6687B71EDDD12DE38DFEEA1A6B089C91F5EBC" -" ipv6=[2001:ac8:a:6:0:2:2eea:9949]:443" -/* nickname=DTFNODE32 */ +"206.217.136.47 orport=443 id=8696DC7AC0470F6ED5C7AC48030002D7D3716FC9" +/* nickname=TakTor01 */ /* extrainfo=0 */ /* ===== */ , -"171.25.193.20 orport=443 id=DD8BD7307017407FCC36F8D04A688F74A0774C02" -" ipv6=[2001:67c:289c::20]:443" -/* nickname=DFRI0 */ +"185.65.206.154 orport=443 id=3BB47BFF2788B534A5BACA37879C48EEBE5E8800" +/* nickname=laruneheureuse */ /* extrainfo=0 */ /* ===== */ , -"185.38.175.71 orport=443 id=B2380704C53947B1D72E7CBCD361E73901EF7444" -" ipv6=[2a01:4262:1ab:20::71]:9050" -/* nickname=Labitat1 */ +"142.4.213.105 orport=443 id=082A6032BD1BB3C95F8DA9F1761F56C21297B2FC" +/* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"188.68.46.245 orport=9001 id=856B7EFB7E09D02A29DD2FF024B7E1EFE21FE9EB" -" ipv6=[2a03:4000:22:175:a452:acff:fefc:987f]:9001" -/* nickname=Piratenpartei02 */ +"37.221.67.70 orport=9001 id=E9EF002E8D2911AFAB1121EF281858484F3ECA73" +/* nickname=Bastion */ /* extrainfo=0 */ /* ===== */ , -"176.123.7.102 orport=443 id=2D2DEFAF19F705EA2978E616F740B771444A4C3D" -/* nickname=RunningOnFumes5 */ +"212.47.237.127 orport=9001 id=38EF2FCFE72C49C634FE082D6CAB5D8F423B4626" +/* nickname=KonjikiNoYami */ /* extrainfo=0 */ /* ===== */ , -"45.62.210.72 orport=9001 id=30CA5BE503177D8932FB312A49505A5737D8E409" -/* nickname=nodvrelay17 */ +"54.36.108.162 orport=443 id=46F9FB943917858F618F2648595DEACD931D4400" +/* nickname=runesandrelics */ /* extrainfo=0 */ /* ===== */ , -"37.252.188.180 orport=443 id=18EA6AFA3609A0B24752FBF411A2DAADE27DE129" -" ipv6=[2a00:63c1:d:180::2]:443" -/* nickname=C3WEyeOfSauron */ +"158.255.215.41 orport=7654 id=AF2E60DEEA9971F6956A46CE0B6BC94EF558240E" +/* nickname=saturna */ /* extrainfo=0 */ /* ===== */ , -"83.243.68.194 orport=49005 id=DFCDAF8A65F523212B1E4228B61815E72614D25A" -/* nickname=thorchic */ +"157.131.206.89 orport=443 id=CF4DB0E0480FEB1E8F59C3D774EB9275283D579D" +/* nickname=GreetingsFromTheNet */ /* extrainfo=0 */ /* ===== */ , -"83.212.102.114 orport=29950 id=080BBF9B14454976FDEAD1AD620A04388F5A21F8" -" ipv6=[2001:648:2ffc:1225:a800:4ff:fe50:934c]:29950" -/* nickname=AEtherC0r3 */ +"138.201.196.156 orport=9001 id=629DE11D15B760521E1391B2D0722698FDC103DF" +" ipv6=[2a01:4f8:172:3e5b::2]:9001" +/* nickname=pilatus */ /* extrainfo=0 */ /* ===== */ , -"37.218.242.84 orport=8443 id=9737BEB02DB9FE6A89F2A022081FB7DDAC751AEB" -/* nickname=atoratvm */ +"45.61.185.90 orport=9000 id=098F98538A21A16332E8C4B724305C2A3496A467" +" ipv6=[2605:6400:40:febd:48d8:7117:124f:cc45]:9000" +/* nickname=Quetzalcoatl */ /* extrainfo=0 */ /* ===== */ , -"37.191.195.28 orport=44100 id=1D81272219B679D511930499AD8286BCD8F6C445" +"194.145.150.15 orport=443 id=326853AA78DA467E997E6040ADD0DCFF840E0CB5" +" ipv6=[2001:1578:200:10::c]:443" /* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"178.170.10.3 orport=443 id=699653E5DF094B56775275F8A4F4BFA7C5BD5E2F" -" ipv6=[2a00:c70:130:1::506]:443" -/* nickname=TRB1 */ +"95.216.115.85 orport=443 id=22BCD0DFD148209C9860C7F89907AB4DEE974A08" +/* nickname=Fastnet */ /* extrainfo=0 */ /* ===== */ , -"81.6.43.252 orport=9001 id=54A403A1B015F6E5A641AD121530966BD873136E" -" ipv6=[2a02:169:200:d::15]:9001" -/* nickname=ulula */ +"134.249.106.21 orport=9001 id=5F6B1DF8C9FA561EC11670C455A4A9188D7F96D9" +/* nickname=tr297e2 */ /* extrainfo=0 */ /* ===== */ , -"193.108.117.209 orport=443 id=7600680249A22080ECC6173FBBF64D6FCF330A61" -/* nickname=Ichotolot62 */ +"58.185.69.242 orport=8443 id=DF6F2B91C93270771C8EC92D243A7CB6234244A1" +/* nickname=orangepeel */ /* extrainfo=0 */ /* ===== */ , -"92.243.0.63 orport=9001 id=95F22A129FD1EE5BFF95218DDBA838BF6DBBDA7E" -" ipv6=[2001:4b98:dc0:41:216:3eff:fed6:a283]:9001" -/* nickname=debaze */ +"46.23.72.81 orport=443 id=7737A40305131AD8B5E60CFB9126E4BBE1ED7F76" +/* nickname=frankovich */ /* extrainfo=0 */ /* ===== */ , -"37.187.23.232 orport=80 id=F4873B3EC3325B81DC36C7E38AD3A5ED12B2F339" -/* nickname=Islay */ +"134.209.224.96 orport=443 id=736CD23D364941A7C23DE00FD21E44D16B50F388" +/* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"91.132.145.245 orport=9001 id=447A24F3402C4774D89E7AAD2D876D0BF64E3267" -" ipv6=[2a03:4000:37:76e:68f6:30ff:fe7c:a4]:9001" -/* nickname=m0rix */ +"103.228.53.155 orport=9001 id=01CB2E297A8F586DBBCF98F028A3D1A49B0AB7BA" +/* nickname=Overjump */ /* extrainfo=0 */ /* ===== */ , -"31.209.7.91 orport=9001 id=1316EE0CEBEE45E1EF4942927EC717E1AF529A68" -/* nickname=Styx */ +"213.65.114.38 orport=65187 id=AB0D440FFAE565EFCE7D0278A3E87DAE5FA29578" +/* nickname=Belgarath4TOR1 */ /* extrainfo=0 */ /* ===== */ , -"95.216.118.16 orport=4223 id=81893D8444F0C9100CCD963BD0D62BBC50121D14" -/* nickname=geekboxNEO */ +"140.78.100.29 orport=8443 id=73F34CDC592584C0519988E443E6FDFBA72C790B" +/* nickname=INSRelay29at8443 */ /* extrainfo=0 */ /* ===== */ , -"79.124.7.11 orport=443 id=B63626A3CA6F0521847853DDEC6D4044C80B903E" -/* nickname=trumaine */ +"193.108.117.59 orport=9001 id=B00B6BA943600447CF72D58DB7A35B16754E43C8" +/* nickname=MyTorNode */ /* extrainfo=0 */ /* ===== */ , -"173.249.57.253 orport=433 id=467D7417FFA611BC20227FE347494CE5F61218FB" -" ipv6=[2a02:c207:3002:8283::1]:433" -/* nickname=DjMiddle */ +"69.164.221.78 orport=443 id=E46979A3053D43ADF187463A6E4856C875BC8C89" +" ipv6=[2600:3c03::f03c:91ff:fe70:357]:443" +/* nickname=teller */ /* extrainfo=0 */ /* ===== */ , -"138.197.171.88 orport=9001 id=2E5B5397CDD7F02798F9713B2C3D85C3FEFBAFBE" -/* nickname=Unnamed */ +"188.138.33.233 orport=443 id=D80EA21626BFAE8044E4037FE765252E157E3586" +/* nickname=bonjour1 */ /* extrainfo=0 */ /* ===== */ , -"88.198.112.25 orport=9001 id=AD1FC4AE877B2FFEB3C84F1A6B76E9B057AAEF4E" -" ipv6=[2a01:4f8:c0c:53fc::1]:9050" -/* nickname=nicknametor */ +"85.214.147.9 orport=443 id=0FDC9A7D60608123CF5432F6E25C6E4BC23E7938" +/* nickname=SchweinfurtsTor2 */ /* extrainfo=0 */ /* ===== */ , -"81.17.60.24 orport=9001 id=947FFF456CFCEF5DCAB09422E1945A8D21AEEC62" -/* nickname=SPFCFutebol */ +"185.220.103.120 orport=443 id=9F0FEE115DF5A0E3F5A975378064D63EC21B4A19" +/* nickname=SpeedTest8 */ /* extrainfo=0 */ /* ===== */ , -"185.233.107.110 orport=9030 id=62274AC17DCCF4030A6AD8CEBED0C36E7B8592D8" -" ipv6=[2a03:4000:24:829::3]:9030" -/* nickname=fiedlerRelay08 */ +"37.120.190.160 orport=9001 id=C1B513BB5E15A1887B6ADCA8C010630732FC389A" +" ipv6=[2a03:4000:6:b39a::2]:9001" +/* nickname=fiedlerRelay03 */ /* extrainfo=0 */ /* ===== */ , -"37.191.195.67 orport=38443 id=E03E581AA42A211F69DC63608B1980F10AE52C26" -/* nickname=Unnamed */ +"213.164.204.90 orport=9001 id=22C1314867920DA37001DAD1A63F1D5CABF9DB11" +/* nickname=Hydra30 */ /* extrainfo=0 */ /* ===== */ , -"193.182.144.53 orport=443 id=F001CD2A9E27B7E3ECD120951CAF968213967B31" -/* nickname=Dragons */ +"83.53.71.25 orport=9001 id=AC7CF877B281BFEF34733E142C2A6F647AC57D82" +/* nickname=mitorip */ /* extrainfo=0 */ /* ===== */ , -"51.255.106.85 orport=443 id=CE8AE3563E13106A46EAD09A65AD70A5A097998F" -/* nickname=tethys */ +"51.15.85.13 orport=3158 id=07C8367E5B7D178B899578578BFC111FB4DDF2EA" +/* nickname=tdz */ /* extrainfo=0 */ /* ===== */ , -"51.159.139.61 orport=443 id=5C86A09946A49E09AD64A14636DFF91746515175" -/* nickname=tirz */ +"104.37.193.102 orport=443 id=96CAA917F65BCD62CECD236F67652BFD7C69E52E" +/* nickname=TorRelay01 */ /* extrainfo=0 */ /* ===== */ , -"71.166.42.70 orport=443 id=34133CC3192CF7538089B14511400DF21BA5A077" -/* nickname=Harambe */ +"136.49.38.118 orport=443 id=EC0ABA811E4EB33DAD8BC8B7037D862BF4F3AA28" +/* nickname=mortimerAtx */ /* extrainfo=0 */ /* ===== */ , -"95.216.19.207 orport=21 id=4D70F05DD308A2EA5B671E440879BFADAC92860F" -" ipv6=[2a01:4f9:2a:1430::2]:21" -/* nickname=arbitraryTessa1 */ +"107.189.28.100 orport=9000 id=0A76C0A0A721DDBC324B705ADBFC95FD806AE855" +" ipv6=[2605:6400:30:f052:2387:1aef:e178:b3d7]:9000" +/* nickname=Quetzalcoatl */ /* extrainfo=0 */ /* ===== */ , -"185.86.150.133 orport=443 id=1684B30AE2ADD371E5D3A8B3F28ACA4CE9CA2E00" -" ipv6=[2a02:7aa0:1619::94eb:3758]:443" -/* nickname=Unnamed */ +"151.32.131.255 orport=443 id=2B18524260FBF9DF47CABBC22E811E76B197395E" +/* nickname=torrone */ /* extrainfo=0 */ /* ===== */ , -"213.239.217.68 orport=4433 id=FFBC69467B37D6AC66598BBD295F9B0D74119ADC" -/* nickname=plan9leia */ +"114.23.164.80 orport=9001 id=CB81BCFD44FC142616BB5983648BD8AF01930789" +/* nickname=ss23voyager */ /* extrainfo=0 */ /* ===== */ , -"51.178.17.128 orport=9001 id=5DA4305BD06BD6F6A30BB06C34C251E256AC1328" -/* nickname=prrlvrRelay */ +"209.141.59.180 orport=443 id=AE5B9D83AD2D7B5C10604E457ACC5E2DD9A6D81E" +/* nickname=freedomisnotfree */ /* extrainfo=0 */ /* ===== */ , -"212.47.236.95 orport=443 id=7C5C0E83CA290FFF6D5E30D9E0E3FFC9BAE0D0C5" -" ipv6=[2001:bc8:47a0:201f::1]:443" -/* nickname=Gu1nn3zzRelay */ +"45.132.246.38 orport=9001 id=431702B3A68A6015F9955DD4FD0129175B43EA0F" +" ipv6=[2a03:4000:48:182:74dd:c1ff:fea8:d21e]:9001" +/* nickname=bituman */ /* extrainfo=0 */ /* ===== */ , -"114.23.164.80 orport=9001 id=CB81BCFD44FC142616BB5983648BD8AF01930789" -/* nickname=ss23voyager */ +"109.92.182.91 orport=9001 id=28FDCC237E83C4EF83376336DB960D11D49FA756" +/* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"179.43.156.214 orport=443 id=EDB5CB4E8609599C98F1B5C939B26B2A9BA9333B" -/* nickname=sosa */ +"172.73.184.37 orport=443 id=11AEE567D24CDE680AC78BCD6EBAC36C50B3CF49" +/* nickname=Mirage */ /* extrainfo=0 */ /* ===== */ , -"142.4.215.43 orport=443 id=C1D5B04F19B45EA0F4FA65B57DFCA265D00FD80B" -/* nickname=Unnamed */ +"95.154.25.167 orport=9001 id=AF475359500A11B48E11561CB282955DF7AA15D0" +/* nickname=ramstor1 */ /* extrainfo=0 */ /* ===== */ , -"87.168.177.66 orport=9001 id=C47A245E3B12C82CB4ABBF283E66D478CCF8E240" -/* nickname=thardes2 */ +"185.31.136.244 orport=8181 id=B2242163F681F77F93190663AC5F696ACF76C4FD" +" ipv6=[2a00:bbe0:0:221f:9eb6:54ff:fea7:1b2d]:8181" +/* nickname=torexit42 */ /* extrainfo=0 */ /* ===== */ , -"109.241.167.138 orport=9001 id=83C81FF619BE11C46F0E98B27B437154779ED6CC" -/* nickname=MorbidHenry */ +"185.220.102.254 orport=993 id=D13692D97236C0B8E8E19EA2DD952B5C4F9010BB" +" ipv6=[2a0b:f4c1:2::254]:993" +/* nickname=Digitalcourage4ip7b */ /* extrainfo=0 */ /* ===== */ , -"198.180.150.9 orport=9001 id=60E4C5E306D2DB22890EE24A09F9B6C30AF396A8" -/* nickname=rgiad */ +"40.122.165.48 orport=443 id=32C6B88EEBD4F6F5AA61F15952E8D88EAD7C67BE" +/* nickname=AnonUS00 */ /* extrainfo=0 */ /* ===== */ , -"195.154.241.145 orport=443 id=FF3D6D040641D5A33ECC8B2B57D5BC59714C4209" -/* nickname=Unnamed */ +"176.9.1.211 orport=9001 id=D123C0F8F562804693C47D68C61786023B295E98" +" ipv6=[2a01:4f8:141:31c2:5054:ff:fe00:ea09]:9001" +/* nickname=bmwanon3 */ /* extrainfo=0 */ /* ===== */ , -"178.62.251.184 orport=9001 id=69C4C2CFCF6B418636976B5FFC0140A3BE211312" -" ipv6=[2a03:b0c0:2:d0::95:9001]:9001" -/* nickname=xdefTorEvey */ +"162.212.158.82 orport=9201 id=CF8CC4763298F77FF64DAF340D26D1BBF3362C5B" +/* nickname=Assange034us2 */ /* extrainfo=0 */ /* ===== */ , -"101.100.146.147 orport=443 id=E300CEE2255A22B3DF52E798A3237D53AFAEC2F3" -/* nickname=ExplorationRelay */ +"146.59.45.119 orport=443 id=CE6A9A13BB16F845C531F72923AB5D72C2C91848" +/* nickname=morgana */ /* extrainfo=0 */ /* ===== */ , -"172.245.21.215 orport=80 id=BA0BA7A976F153DBB050266CD3D21F499FCB975D" -/* nickname=clanofxymox */ +"107.189.6.61 orport=9100 id=46BFF98FBD77441B28A345DFCF0F11F70EB4A4B9" +" ipv6=[2605:6400:30:f00f:1854:a31c:7871:2582]:9100" +/* nickname=Quetzalcoatl */ /* extrainfo=0 */ /* ===== */ , -"163.172.169.253 orport=9001 id=04A28A62F27D9C4A60F9ED0C4264E98B988C65A3" -" ipv6=[2001:bc8:47a4:e0a::1]:9001" -/* nickname=darknebula */ +"45.142.100.30 orport=443 id=A013BBF2E931A7D58A3707C84761B3F6AAAB25D5" +" ipv6=[2a10:46c0:0:2::13]:443" +/* nickname=siffeurattex */ /* extrainfo=0 */ /* ===== */ , -"179.43.169.20 orport=443 id=65E40F7EDD28E2CF28684E30E0BAB7706819CFC3" -/* nickname=Fangio */ +"178.63.172.14 orport=443 id=0A178D302936F209AF3DA77CCC4E3C4D5DBE11E9" +/* nickname=pusith */ /* extrainfo=0 */ /* ===== */ , -"109.70.100.11 orport=443 id=96E095D5CDBFC3988DEB708EC155346472402C32" -" ipv6=[2a03:e600:100::11]:443" -/* nickname=karfiol */ +"37.221.65.169 orport=8443 id=39A18F31B312E5CB211781090766934C1CFDAB36" +" ipv6=[2001:678:6d4:6010::3aed:102]:8443" +/* nickname=Aramis66 */ /* extrainfo=0 */ /* ===== */ , -"140.78.100.19 orport=8443 id=885C7B6EB943068B762070E276E299319E5AB08C" -/* nickname=INSRelay19at8443 */ +"64.44.51.37 orport=443 id=410F0781BCA296C866822A5D03A8D11F2457E78C" +" ipv6=[2602:ffc8:1:7::bad]:443" +/* nickname=torr1maiti */ /* extrainfo=0 */ /* ===== */ , -"185.117.118.15 orport=9001 id=389FBE96BA489D93AF2124EB9ABE339FC4C72F1B" -/* nickname=folo */ +"85.239.33.8 orport=9001 id=62F65E6377F0647CE0F0EE2AAE1641EC4AA2BD3B" +/* nickname=Piplup */ /* extrainfo=0 */ /* ===== */ , -"199.195.251.84 orport=9001 id=324E13FD795713BDD6E8B4DF02438742CA1FDBF1" -" ipv6=[2605:6400:10:80e::1]:9001" -/* nickname=Alina */ +"185.239.222.253 orport=443 id=7238EAB91E1050B6C6BEDDFCFD7A2440869B114A" +" ipv6=[2a09:2681:101:9001::14]:443" +/* nickname=BM14 */ /* extrainfo=0 */ /* ===== */ , -"157.131.206.89 orport=443 id=CF4DB0E0480FEB1E8F59C3D774EB9275283D579D" -/* nickname=GreetingsFromTheNet */ +"162.247.74.213 orport=443 id=84D361B736A8CD1E8818D0FC186892E91AB76881" +/* nickname=CalyxInstitute03 */ /* extrainfo=0 */ /* ===== */ , -"94.226.6.98 orport=9443 id=36EE8D47E570B8D5515460A9972F3CFD9EDFDFCE" -/* nickname=R1610091651 */ +"51.81.160.187 orport=9001 id=F4DD04C48A6CB6DB36DF6381FFB42D5BFAD97501" +/* nickname=FreedomRelay2 */ /* extrainfo=0 */ /* ===== */ , -"23.129.64.164 orport=443 id=687EFE281D08C65DE80935DEF63524EA053672B5" -" ipv6=[2620:18c:0:192::164]:443" -/* nickname=shelob */ +"109.70.100.16 orport=443 id=B1045E12FA4EA0D457A74013866CB41DC0D290BF" +" ipv6=[2a03:e600:100::16]:443" +/* nickname=broccoli */ /* extrainfo=0 */ /* ===== */ , -"98.217.124.239 orport=9001 id=BCE86415B2EC28E449D360F632647E95D08F83C9" -" ipv6=[2001:558:6017:16b:e5cc:c5c0:daaa:dd12]:9001" -/* nickname=MalfunctioningEddy */ +"104.152.209.130 orport=443 id=A4A79E2B8294AA2572B46C5C772E149F84FAF763" +/* nickname=Shebangs */ /* extrainfo=0 */ /* ===== */ , -"178.17.174.239 orport=9001 id=53C9F4954E7A7332BB0C610C5B8E04CA065AF29B" -" ipv6=[2a00:1dc0:caff:126::a5c9]:9001" -/* nickname=Aramis67 */ +"213.227.133.129 orport=443 id=94318CC2299A3826D81899EB23C25A2B7D6B1FFE" +/* nickname=byrdeman */ /* extrainfo=0 */ /* ===== */ , -"51.15.246.170 orport=443 id=C0DAAAE5EE461BBE13945FE4B52F32ABDC6BC376" -" ipv6=[2001:bc8:47b0:1756::1]:443" -/* nickname=mitsuha */ +"54.36.101.21 orport=9001 id=D9C55AC5549BF4940BE0ABBBE0E34CCC8D6D06E5" +/* nickname=ExiTOR */ /* extrainfo=0 */ /* ===== */ , -"185.220.101.19 orport=10019 id=7E281CD2C315C4F7A84BC7C8721C3BC974DDBFA3" -" ipv6=[2a0b:f4c2::19]:10019" -/* nickname=relayon0130 */ +"104.244.76.13 orport=443 id=1C0D0AF3FF05CCBBA4B6ED262196A4C5A76102E6" +/* nickname=SpongeBob */ /* extrainfo=0 */ /* ===== */ , -"192.34.58.232 orport=9004 id=4C2C62B0828413159CBD076501C7D83BD0899893" -/* nickname=ProEscort */ +"49.12.93.240 orport=443 id=602A20F90E20D1B9EA4DD87AE948B590C61F8A94" +/* nickname=skewed */ /* extrainfo=0 */ /* ===== */ , -"162.212.158.82 orport=9201 id=CF8CC4763298F77FF64DAF340D26D1BBF3362C5B" -/* nickname=Assange034us2 */ +"37.59.37.59 orport=9001 id=B7E2EBFBE4462FC908E48007517C53ED0FF752B2" +/* nickname=Unnamed */ /* extrainfo=0 */ /* ===== */ , -"135.125.55.228 orport=443 id=B737FB6CBF7E514DD8D8B432A1497B9DBD0C45DA" -/* nickname=freedomRelay */ +"140.78.100.25 orport=8443 id=9385FF13D9E3BAB934ABCBA61EE63E10346E3673" +/* nickname=INSRelay25at8443 */ /* extrainfo=0 */ /* ===== */ , -"185.220.100.241 orport=9000 id=62F4994C6F3A5B3E590AEECE522591696C8DDEE2" -" ipv6=[2a0b:f4c0:16c:15::1]:9000" -/* nickname=F3Netze */ +"185.220.103.118 orport=9000 id=3C84D97D9846044338D6DC013A6F62A9291F4614" +/* nickname=SpeedTest5 */ /* extrainfo=0 */ /* ===== */ ,

1 0

[Git][tpo/applications/fenix][tor-browser-91.2.0-10.5-2] 2 commits: Revert "Bug 40193: Add banner for VPN survey to Android homepage"
by Matthew Finkel (＠sysrqb) 21 Oct '21

21 Oct '21

Matthew Finkel pushed to branch tor-browser-91.2.0-10.5-2 at The Tor Project / Applications / fenix Commits: bd49ef24 by Matthew Finkel at 2021-10-20T18:46:13+00:00 Revert "Bug 40193: Add banner for VPN survey to Android homepage" This reverts commit 0dffacd86eee81fe774e4c88dfc90d129440312e. - - - - - 5228c8ee by Matthew Finkel at 2021-10-21T04:09:02+00:00 Bug 40194 - Add 2021 YEC home screen - - - - - 20 changed files: - LICENSE - app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt - app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt - − app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorInfoBannerViewHolder.kt - app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt - app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt - + app/src/main/res/drawable/ic_yec_activist_android.png - − app/src/main/res/drawable/info_banner_padded_background.xml - + app/src/main/res/drawable/tor_yec_donate_rounded_corners.xml - − app/src/main/res/drawable/vpn_survey_icon.png - + app/src/main/res/font/corben_bold.ttf - + app/src/main/res/font/corben_regular.ttf - app/src/main/res/layout/fragment_home.xml - − app/src/main/res/layout/tor_info_banner.xml - app/src/main/res/values/colors.xml - app/src/main/res/values/styles.xml - app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== LICENSE ===================================== @@ -371,3 +371,102 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice This Source Code Form is "Incompatible With Secondary Licenses", as defined by the Mozilla Public License, v. 2.0. + +=============================================================================== + +"Corben" font. + +Copyright (c) 2010, 2011 by vernon adams (vern(a)newtypography.co.uk) +with Reserved Font Name Corben. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. ===================================== app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -50,6 +50,7 @@ import com.google.android.material.snackbar.Snackbar import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_home.view.bottomBarShadow import kotlinx.android.synthetic.main.fragment_home.view.bottom_bar +import kotlinx.android.synthetic.main.fragment_home.view.donate_now_button import kotlinx.android.synthetic.main.fragment_home.view.exploreprivately import kotlinx.android.synthetic.main.fragment_home.view.homeAppBar import kotlinx.android.synthetic.main.fragment_home.view.menuButton @@ -59,6 +60,7 @@ import kotlinx.android.synthetic.main.fragment_home.view.tab_button import kotlinx.android.synthetic.main.fragment_home.view.toolbar import kotlinx.android.synthetic.main.fragment_home.view.toolbarLayout import kotlinx.android.synthetic.main.fragment_home.view.toolbar_wrapper +import kotlinx.android.synthetic.main.fragment_home.view.yec_activist_image import kotlinx.android.synthetic.main.no_collections_message.view.add_tabs_to_collections_button import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.Main @@ -88,6 +90,7 @@ import mozilla.components.support.base.feature.ViewBoundFeatureWrapper import mozilla.components.support.ktx.android.content.res.resolveAttribute import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged import mozilla.components.ui.tabcounter.TabCounterMenu +import mozilla.components.support.locale.LocaleManager import org.mozilla.fenix.BrowserDirection import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.Config @@ -127,6 +130,7 @@ import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.topsites.DefaultTopSitesView import org.mozilla.fenix.onboarding.FenixOnboarding import org.mozilla.fenix.settings.SupportUtils +import org.mozilla.fenix.settings.advanced.getSelectedLocale import org.mozilla.fenix.settings.deletebrowsingdata.deleteAndQuit import org.mozilla.fenix.tor.bootstrap.TorQuickStart import org.mozilla.fenix.theme.ThemeManager @@ -333,6 +337,20 @@ class HomeFragment : Fragment() { activity.themeManager.applyStatusBarTheme(activity) adjustHomeFragmentView(currentMode.getCurrentMode(), view) showSessionControlView(view) + + view?.donate_now_button?.setOnClickListener { + val country = LocaleManager.getSelectedLocale(requireContext()).country + var locale = LocaleManager.getSelectedLocale(requireContext()).language + if (country != "") { + locale = "${locale}-${country}" + } + val localeUrl = "https://www.torproject.org/donate/donate-phr-bp1-mobile-${locale}" + activity.openToBrowserAndLoad( + searchTermOrURL = localeUrl, + newTab = true, + from = BrowserDirection.FromHome + ) + } view } @@ -340,6 +358,28 @@ class HomeFragment : Fragment() { super.onConfigurationChanged(newConfig) getMenuButton()?.dismissMenu() + + //view.donationmatch.setOnClickListener { + // activity.openToBrowserAndLoad( + // searchTermOrURL = "https://blog.torproject.org/friends-of-tor-match-2020", + // newTab = true, + // from = BrowserDirection.FromHome + // ) + //} + + view?.donate_now_button?.setOnClickListener { + val country = LocaleManager.getSelectedLocale(requireContext()).country + var locale = LocaleManager.getSelectedLocale(requireContext()).language + if (country != "") { + locale = "${locale}-${country}" + } + val localeUrl = "https://www.torproject.org/donate/donate-phr-bp1-mobile-${locale}" + (activity as HomeActivity).openToBrowserAndLoad( + searchTermOrURL = localeUrl, + newTab = true, + from = BrowserDirection.FromHome + ) + } } private fun dismissTip(tip: Tip) { @@ -474,6 +514,14 @@ class HomeFragment : Fragment() { toolbarLayoutHeight - SESSION_CONTROL_VIEW_PADDING ) } + view.donate_now_button?.apply { + (layoutParams as ViewGroup.MarginLayoutParams).setMargins( + 0, + 0, + 0, + toolbarLayoutHeight - SESSION_CONTROL_VIEW_PADDING + ) + } } } else { view.sessionControlRecyclerView?.apply { @@ -484,16 +532,41 @@ class HomeFragment : Fragment() { height - SESSION_CONTROL_VIEW_PADDING ) } + view.donate_now_button?.apply { + (layoutParams as ViewGroup.MarginLayoutParams).setMargins( + 0, + 0, + 0, + height - SESSION_CONTROL_VIEW_PADDING + ) + } } } - // Hide the onion pattern during Onboarding, too. - view?.onion_pattern_image?.apply { + + // Hide the EOY image during Onboarding, too. + view?.yec_activist_image?.apply { + visibility = if (onboarding.userHasBeenOnboarded()) { + View.VISIBLE + } else { + View.GONE + } + } + // Hide the EOY donate button during Onboarding, too. + view?.donate_now_button?.apply { visibility = if (onboarding.userHasBeenOnboarded()) { View.VISIBLE } else { View.GONE } } + // Hide the onion pattern during Onboarding, too. + //view?.onion_pattern_image?.apply { + // visibility = if (onboarding.userHasBeenOnboarded()) { + // View.VISIBLE + // } else { + // View.GONE + // } + //} view?.homeAppBar?.apply { visibility = View.VISIBLE ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt ===================================== @@ -25,7 +25,6 @@ import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.NoCollectionsMessageViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.PrivateBrowsingDescriptionViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.TorBootstrapPagerViewHolder -import org.mozilla.fenix.home.sessioncontrol.viewholders.TorInfoBannerViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.TabInCollectionViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.TopSitePagerViewHolder import org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding.ExperimentDefaultBrowserCardViewHolder @@ -91,7 +90,6 @@ sealed class AdapterItem(@LayoutRes val viewType: Int) { } object PrivateBrowsingDescription : AdapterItem(PrivateBrowsingDescriptionViewHolder.LAYOUT_ID) - object TorInfoBanner : AdapterItem(TorInfoBannerViewHolder.LAYOUT_ID) object NoCollectionsMessage : AdapterItem(NoCollectionsMessageViewHolder.LAYOUT_ID) object TorBootstrap : AdapterItem(TorBootstrapPagerViewHolder.LAYOUT_ID) @@ -231,10 +229,6 @@ class SessionControlAdapter( view, interactor ) - TorInfoBannerViewHolder.LAYOUT_ID -> TorInfoBannerViewHolder( - view, - interactor - ) TorBootstrapPagerViewHolder.LAYOUT_ID -> TorBootstrapPagerViewHolder( view, components, ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt ===================================== @@ -94,11 +94,6 @@ interface SessionControlController { */ fun handlePrivateBrowsingLearnMoreClicked() - /** - * @see [TabSessionInteractor.onTorInfoBannerLaunchClicked] - */ - fun handleTorInfoBannerLaunchClicked() - /** * @see [TopSiteInteractor.onRenameTopSiteClicked] */ @@ -652,12 +647,4 @@ class DefaultSessionControlController( override fun handleTorNetworkSettingsClicked() { openTorNetworkSettings() } - - override fun handleTorInfoBannerLaunchClicked() { - activity.openToBrowserAndLoad( - searchTermOrURL = SupportUtils.TOR_INFO_BANNER_URL, - newTab = true, - from = BrowserDirection.FromHome - ) - } } ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlInteractor.kt ===================================== @@ -23,12 +23,6 @@ interface TabSessionInteractor { * "Common myths about private browsing" link in private mode. */ fun onPrivateBrowsingLearnMoreClicked() - - /** - * Shows the Info Banner web page in a new tab. Called when a user clicks on the - * "Learn More" button. - */ - fun onTorInfoBannerLaunchClicked() } /** @@ -418,8 +412,4 @@ class SessionControlInteractor( override fun onTorBootstrapNetworkSettingsClicked() { controller.handleTorNetworkSettingsClicked() } - - override fun onTorInfoBannerLaunchClicked() { - controller.handleTorInfoBannerLaunchClicked() - } } ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlView.kt ===================================== @@ -92,7 +92,7 @@ private fun showCollections( } } -private fun privateModeAdapterItems() = listOf(AdapterItem.TorInfoBanner) +private fun privateModeAdapterItems() = listOf(AdapterItem.PrivateBrowsingDescription) private fun bootstrapAdapterItems() = listOf(AdapterItem.TorBootstrap) ===================================== app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TorInfoBannerViewHolder.kt deleted ===================================== @@ -1,33 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.fenix.home.sessioncontrol.viewholders - -import android.graphics.Typeface -import android.text.SpannableString -import android.text.Spanned -import android.text.style.StyleSpan -import android.view.View -import androidx.recyclerview.widget.RecyclerView -import kotlinx.android.synthetic.main.tor_info_banner.view.* -import org.mozilla.fenix.R -import org.mozilla.fenix.home.sessioncontrol.TabSessionInteractor - -class TorInfoBannerViewHolder( - view: View, - private val interactor: TabSessionInteractor -) : RecyclerView.ViewHolder(view) { - - init { - with(view.info_banner_launch_button) { - setOnClickListener { - interactor.onTorInfoBannerLaunchClicked() - } - } - } - - companion object { - const val LAYOUT_ID = R.layout.tor_info_banner - } -} ===================================== app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt ===================================== @@ -40,7 +40,6 @@ object SupportUtils { const val DONATE_URL = "https://donate.torproject.org/" const val TB_MANUAL_URL = "https://tb-manual.torproject.org/mobile-tor" const val TOR_RELEASES = "https://www.torproject.org/releases/" - const val TOR_INFO_BANNER_URL = "http://eh5esdnd6fkbkapfc6nuyvkjgbtnzq2is72lmpwbdbxepd2z7zbgzsqd.onion/index…" enum class SumoTopic(internal val topicStr: String) { FENIX_MOVING("sync-delist"), ===================================== app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt ===================================== @@ -32,7 +32,7 @@ abstract class ThemeManager { @get:StyleRes val currentThemeResource get() = when (currentTheme) { BrowsingMode.Normal -> R.style.NormalTheme - BrowsingMode.Private -> R.style.PrivateTheme + BrowsingMode.Private -> R.style.PrivateEOYTheme } /** ===================================== app/src/main/res/drawable/ic_yec_activist_android.png ===================================== Binary files /dev/null and b/app/src/main/res/drawable/ic_yec_activist_android.png differ ===================================== app/src/main/res/drawable/info_banner_padded_background.xml deleted ===================================== @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="@color/info_banner_padded_background_color"> - <item - android:bottom="6dp" - android:top="6dp"> - <shape android:shape="rectangle"> - <corners android:radius="4dp" /> - </shape> - </item> -</ripple> ===================================== app/src/main/res/drawable/tor_yec_donate_rounded_corners.xml ===================================== @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> + + + +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="#EFB149" /> + <corners android:radius="10dp" /> +</shape> ===================================== app/src/main/res/drawable/vpn_survey_icon.png deleted ===================================== Binary files a/app/src/main/res/drawable/vpn_survey_icon.png and /dev/null differ ===================================== app/src/main/res/font/corben_bold.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/corben_bold.ttf differ ===================================== app/src/main/res/font/corben_regular.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/corben_regular.ttf differ ===================================== app/src/main/res/layout/fragment_home.xml ===================================== @@ -81,21 +81,79 @@ <TextView android:id="@+id/exploreprivately" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center|center_vertical" - android:gravity="center_horizontal" + android:layout_gravity="center_horizontal|center_vertical" android:clickable="false" - android:ellipsize="end" android:focusable="false" + android:fontFamily="@font/corben_bold" + android:gravity="center" android:importantForAccessibility="no" - android:text="@string/tor_explore_privately" - android:fontFamily="Roboto-Medium" - android:textColor="#DEFFFFFF" - android:textSize="40sp" - android:lineSpacingMultiplier="1.1" - app:layout_scrollFlags="scroll" - android:visibility="gone" /> + android:paddingStart="35dp" + android:paddingTop="20dp" + android:paddingEnd="35dp" + android:text="@string/tor_privacy_human_right" + android:textColor="#FAF5DF" + android:textSize="30sp" + app:layout_scrollFlags="scroll" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:orientation="vertical"> + + <ImageView + android:id="@+id/yec_activist_image" + android:layout_width="wrap_content" + android:layout_height="200dp" + android:layout_weight="1" + android:paddingStart="35dp" + android:paddingEnd="35dp" + app:layout_scrollFlags="scroll" + app:srcCompat="@drawable/ic_yec_activist_android" + tools:ignore="ContentDescription" /> + + <Button + android:id="@+id/donate_now_button" + style="@style/TorDonateYecButton" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginStart="35dp" + android:layout_marginEnd="35dp" + android:background="@drawable/tor_yec_donate_rounded_corners" + android:fontFamily="Roboto-Medium" + android:gravity="center" + android:text="@string/tor_onboarding_donate_button" + android:textAllCaps="false" + android:textColor="#000000" + android:textSize="18sp" + android:textStyle="bold" + android:visibility="visible" + tools:ignore="ButtonStyleXmlDetector" /> + + <TextView + android:id="@+id/donationmatch" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:clickable="false" + android:focusable="false" + android:fontFamily="@font/corben_regular" + android:gravity="center" + android:importantForAccessibility="no" + android:lineSpacingMultiplier="1.1" + android:paddingStart="35dp" + android:paddingTop="10dp" + android:paddingEnd="35dp" + android:paddingBottom="20dp" + android:text="@string/tor_donationmatch_202110" + android:textColor="#FAF5DF" + android:textSize="18sp" + android:visibility="visible" + app:layout_scrollFlags="scroll" /> + </LinearLayout> </com.google.android.material.appbar.AppBarLayout> @@ -121,11 +179,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - app:srcCompat="@drawable/ic_onion_pattern" - tools:ignore="ContentDescription" + android:visibility="gone" app:layout_constraintBottom_toTopOf="@id/toolbarLayout" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintStart_toStartOf="parent" + app:srcCompat="@drawable/ic_onion_pattern" + tools:ignore="ContentDescription" /> <androidx.constraintlayout.widget.ConstraintLayout android:id="@+id/toolbarLayout" ===================================== app/src/main/res/layout/tor_info_banner.xml deleted ===================================== @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<androidx.constraintlayout.widget.ConstraintLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/info_banner_wrapper" - style="@style/OnboardingCardLightWithPadding" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:clipChildren="false" - android:clipToPadding="false"> - - <LinearLayout - android:id="@+id/info_banner_header_wrapper" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - android:importantForAccessibility="no"> - - <ImageView - android:id="@+id/tor_info_banner_icon" - android:layout_width="wrap_content" - android:layout_height="32dp" - android:layout_marginEnd="10dp" - android:adjustViewBounds="true" - android:clickable="false" - android:focusable="false" - android:importantForAccessibility="no" - app:srcCompat="@drawable/vpn_survey_icon"/> - - <TextView - android:id="@+id/info_banner_header" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ellipsize="none" - android:lineSpacingExtra="6dp" - android:paddingHorizontal="4dp" - android:paddingTop="4dp" - android:scrollHorizontally="false" - android:textAlignment="viewStart" - android:textColor="?primaryText" - android:textSize="20sp" - android:text="Do you use a VPN?" /> - </LinearLayout> - - <TextView - android:id="@+id/info_banner_description" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ellipsize="none" - android:lineSpacingExtra="6dp" - android:paddingHorizontal="4dp" - android:paddingTop="4dp" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/info_banner_header_wrapper" - android:scrollHorizontally="false" - android:textAlignment="viewStart" - android:textColor="?primaryText" - android:textSize="16sp" - android:text="We’d like to learn more about how and why our users use VPNs. Complete this short ten-minute survey to tell us about your experience:" /> - - <Button - style="@style/PositiveButton" - android:id="@+id/info_banner_launch_button" - android:text="Learn More" - android:layout_marginTop="16dp" - android:textSize="18dp" - android:textColor="@android:color/black" - android:background="@drawable/info_banner_padded_background" - android:fontFamily="Roboto-Medium" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/info_banner_description" /> - -</androidx.constraintlayout.widget.ConstraintLayout> ===================================== app/src/main/res/values/colors.xml ===================================== @@ -191,6 +191,8 @@ <color name="mozac_widget_favicon_background_private_theme">@color/photonInk50</color> <color name="mozac_widget_favicon_border_private_theme">@color/photonInk50</color> + <color name="tor_yec_home_background">#2A1B51</color> +  <color name="tab_tray_item_text_private_theme">@color/photonLightGrey05</color> <color name="tab_tray_item_url_private_theme">@color/photonLightGrey60</color> @@ -424,7 +426,4 @@  <color name="toolbar_menu_transparent">@android:color/transparent</color> - -  - <color name="info_banner_padded_background_color">#A76FFA</color> </resources> ===================================== app/src/main/res/values/styles.xml ===================================== @@ -284,6 +284,10 @@ <style name="PrivateTheme" parent="PrivateThemeBase" /> + <style name="PrivateEOYTheme" parent="PrivateThemeBase" > + <item name="homeBackground">@color/tor_yec_home_background</item> + </style> +  <style name="WindowAnimationTransition"> <item name="android:windowEnterAnimation">@anim/fade_in</item> @@ -322,6 +326,12 @@ <item name="android:textColor">#000000</item> </style> + <style name="TorDonateYecButton" parent="NeutralButton"> + <item name="android:background">@drawable/tor_yec_donate_rounded_corners</item> + <item name="backgroundTint">#EFB149</item> + <item name="android:textColor">#000000</item> + </style> + <style name="DestructiveButton" parent="NeutralButton"> <item name="iconTint">@color/destructive_button_text_color</item> <item name="android:textColor">@color/destructive_button_text_color</item> ===================================== app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -72,4 +72,7 @@  <string name="tor_spoof_english">Request English versions of web pages for enhanced privacy</string> + + <string name="tor_privacy_human_right">Privacy is a human right</string> + <string name="tor_donationmatch_202110">Your donation will be matched by Friends of Tor, up to $150,000.</string> </resources> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/0dffacd86eee… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/0dffacd86eee… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 21 Oct '21

21 Oct '21

commit 938b5e50a92b644f3456b63bfb2389639ea451b5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 21 13:17:46 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index 0906c5c784..109376cb8b 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -10,10 +10,10 @@ # c7a0a66e0476db158663636124cfb54f_370a183, 2020 # Gus, 2020 # h345u37g3 h345u37g3, 2021 -# Ito Takeshi, 2021 # Kaede, 2021 # D A <miramami0403(a)gmail.com>, 2021 # erinm, 2021 +# Ito Takeshi, 2021 # msgid "" msgstr "" @@ -21,7 +21,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-08 13:14+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: erinm, 2021\n" +"Last-Translator: Ito Takeshi, 2021\n" "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -204,7 +204,7 @@ msgstr "歴史" #: https//www.torproject.org/privchat/ #: (content/privchat/contents+en.lrpage.title) msgid "PrivChat" -msgstr "" +msgstr "PrivChat" #: https//www.torproject.org/download/alpha/ #: (content/download/alpha/contents+en.lrpage.title) @@ -242,6 +242,9 @@ msgid "" "add more. Want to help us translate? [See " "here](https://community.torproject.org/localization/)" msgstr "" +"誰もが自分の言語で Tor Browser が使えることを望んでいます。Tor Browser は現在 36 " +"の言語で利用可能で、さらに使える言語を増やそうと活動しています。翻訳を手伝いたいですか? " +"[こちらをご確認ください](https://community.torproject.org/localization/)" #: https//www.torproject.org/download/tor/ #: (content/download/tor/contents+en.lrpage.title) @@ -678,12 +681,12 @@ msgstr "" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.title) msgid "Tor Browser 10.5" -msgstr "" +msgstr "Tor Browser 10.5" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "## New Release: Tor Browser 10.5" -msgstr "" +msgstr "## 新しいリリース: Tor Browser 10.5" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -714,12 +717,12 @@ msgstr "" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "### What's new?" -msgstr "" +msgstr "### 新機能" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "#### V2 Onion Services Deprecation" -msgstr "" +msgstr "#### V2 Onion サービスの非推奨" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -739,7 +742,7 @@ msgstr "" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "#### Snowflake is now available as a bridge" -msgstr "" +msgstr "#### Snowflake がブリッジとして利用可能に" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -821,7 +824,7 @@ msgstr "" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "#### Known Issues" -msgstr "" +msgstr "#### 既知の問題" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) @@ -889,7 +892,7 @@ msgstr "" #: https//www.torproject.org/releases/tor-browser-10-5/ #: (content/releases/tor-browser-10-5/contents+en.lrpage.body) msgid "#### Give Feedback" -msgstr "" +msgstr "#### フィードバックを提供" #: https//www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lrpage.title) @@ -970,7 +973,7 @@ msgstr "" #: https//www.torproject.org/releases/tor-browser-10-0/ #: (content/releases/tor-browser-10-0/contents+en.lrpage.body) msgid "Beginning with the 10.5 series, CentOS 6 is not supported." -msgstr "" +msgstr "10.5 系列からは CentOS 6 はサポートされません。" #: https//www.torproject.org/about/cy-pres/ #: (content/about/cy-pres/contents+en.lrpage.title)

1 0

[tor/main] Merge branch 'tor-gitlab/mr/452_squashed' into main
by ahf＠torproject.org 21 Oct '21

21 Oct '21

commit ae05f06597364f5af20254ab8cf36c65591e59d9 Merge: d320f4d2a2 54ab43d05e Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Oct 21 12:57:37 2021 +0000 Merge branch 'tor-gitlab/mr/452_squashed' into main changes/prop335 | 11 +++++++ doc/man/tor.1.txt | 29 +++++++++++++----- src/app/config/config.c | 3 ++ src/app/config/or_options_st.h | 4 +++ src/core/or/policies.c | 22 ++++++++++++++ src/core/or/policies.h | 1 + src/feature/dirauth/dirauth_options.inc | 4 +++ src/feature/dirauth/dirvote.c | 52 +++++++++++++++++++++++++++++---- src/feature/dirauth/dirvote.h | 6 +++- src/feature/dirauth/process_descs.c | 15 ++++++++++ src/feature/dirauth/process_descs.h | 3 +- src/feature/dirauth/voteflags.c | 11 ++++++- src/feature/dirauth/voteflags.h | 3 +- src/feature/dirparse/ns_parse.c | 2 ++ src/feature/nodelist/fmt_routerstatus.c | 3 +- src/feature/nodelist/node_st.h | 2 ++ src/feature/nodelist/routerstatus_st.h | 2 ++ src/test/test_voting_flags.c | 3 +- 18 files changed, 158 insertions(+), 18 deletions(-)

1 0

[tor/main] Add a new consensus method to handle MiddleOnly specially.
by ahf＠torproject.org 21 Oct '21

21 Oct '21

commit ab26475cabff49767c1b301371d81478695b5943 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 8 11:36:04 2021 -0400 Add a new consensus method to handle MiddleOnly specially. When this method is in place, then any relay which is assigned MiddleOnly has Exit, V2Dir, Guard, and HSDir cleared (and has BadExit set if appropriate). --- src/feature/dirauth/dirvote.c | 41 +++++++++++++++++++++++++++++++++++++++-- src/feature/dirauth/dirvote.h | 6 +++++- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 4f8cf2b8e6..9c13f762e2 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -1479,6 +1479,21 @@ compute_nth_protocol_set(int n, int n_voters, const smartlist_t *votes) return result; } +/** Helper: Takes a smartlist of `const char *` flags, and a flag to remove. + * + * Removes that flag if it is present in the list. Doesn't free it. + */ +static void +remove_flag(smartlist_t *sl, const char *flag) +{ + /* We can't use smartlist_string_remove() here, since that doesn't preserve + * order, and since it frees elements from the string. */ + + int idx = smartlist_string_pos(sl, flag); + if (idx >= 0) + smartlist_del_keeporder(sl, idx); +} + /** Given a list of vote networkstatus_t in <b>votes</b>, our public * authority <b>identity_key</b>, our private authority <b>signing_key</b>, * and the number of <b>total_authorities</b> that we believe exist in our @@ -1633,6 +1648,9 @@ networkstatus_compute_consensus(smartlist_t *votes, tor_free(votesec_list); tor_free(distsec_list); } + // True if anybody is voting on the BadExit flag. + const bool badexit_flag_is_listed = + smartlist_contains_string(flags, "BadExit"); chunks = smartlist_new(); @@ -1924,7 +1942,7 @@ networkstatus_compute_consensus(smartlist_t *votes, const char *chosen_name = NULL; int exitsummary_disagreement = 0; int is_named = 0, is_unnamed = 0, is_running = 0, is_valid = 0; - int is_guard = 0, is_exit = 0, is_bad_exit = 0; + int is_guard = 0, is_exit = 0, is_bad_exit = 0, is_middle_only = 0; int naming_conflict = 0; int n_listing = 0; char microdesc_digest[DIGEST256_LEN]; @@ -2055,7 +2073,6 @@ networkstatus_compute_consensus(smartlist_t *votes, } /* Set the flags. */ - smartlist_add(chosen_flags, (char*)"s"); /* for the start of the line. */ SMARTLIST_FOREACH_BEGIN(flags, const char *, fl) { if (!strcmp(fl, "Named")) { if (is_named) @@ -2077,6 +2094,8 @@ networkstatus_compute_consensus(smartlist_t *votes, is_running = 1; else if (!strcmp(fl, "BadExit")) is_bad_exit = 1; + else if (!strcmp(fl, "MiddleOnly")) + is_middle_only = 1; else if (!strcmp(fl, "Valid")) is_valid = 1; } @@ -2093,6 +2112,22 @@ networkstatus_compute_consensus(smartlist_t *votes, if (!is_valid) continue; + /* Starting with consensus method 32, we handle the middle-only + * flag specially: when it is present, we clear some flags, and + * set others. */ + if (is_middle_only && consensus_method >= MIN_METHOD_FOR_MIDDLEONLY) { + remove_flag(chosen_flags, "Exit"); + remove_flag(chosen_flags, "V2Dir"); + remove_flag(chosen_flags, "Guard"); + remove_flag(chosen_flags, "HSDir"); + is_exit = is_guard = 0; + if (! is_bad_exit && badexit_flag_is_listed) { + is_bad_exit = 1; + smartlist_add(chosen_flags, (char *)"BadExit"); + smartlist_sort_strings(chosen_flags); // restore order. + } + } + /* Pick the version. */ if (smartlist_len(versions)) { sort_version_list(versions, 0); @@ -2253,6 +2288,8 @@ networkstatus_compute_consensus(smartlist_t *votes, smartlist_add_asprintf(chunks, "m %s\n", m); } /* Next line is all flags. The "\n" is missing. */ + smartlist_add_asprintf(chunks, "s%s", + smartlist_len(chosen_flags)?" ":""); smartlist_add(chunks, smartlist_join_strings(chosen_flags, " ", 0, NULL)); /* Now the version line. */ diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index d6a2d9cc75..9cb7fe1694 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -53,7 +53,7 @@ #define MIN_SUPPORTED_CONSENSUS_METHOD 28 /** The highest consensus method that we currently support. */ -#define MAX_SUPPORTED_CONSENSUS_METHOD 31 +#define MAX_SUPPORTED_CONSENSUS_METHOD 32 /** * Lowest consensus method where microdescriptor lines are put in canonical @@ -70,6 +70,10 @@ */ #define MIN_METHOD_FOR_CORRECT_BWWEIGHTSCALE 31 +/** Lowest consensus method for which we handle the MiddleOnly flag specially. + */ +#define MIN_METHOD_FOR_MIDDLEONLY 32 + /** Default bandwidth to clip unmeasured bandwidths to using method >= * MIN_METHOD_TO_CLIP_UNMEASURED_BW. (This is not a consensus method; do not * get confused with the above macros.) */

1 0

[tor/main] Prop335: Changes file and manual entries.
by ahf＠torproject.org 21 Oct '21

21 Oct '21

commit 54ab43d05e67984bda5661cb9530ad8a0b1e2a7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 8 11:42:55 2021 -0400 Prop335: Changes file and manual entries. Closes #40448. --- changes/prop335 | 11 +++++++++++ doc/man/tor.1.txt | 29 ++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/changes/prop335 b/changes/prop335 new file mode 100644 index 0000000000..4fa61ca2e9 --- /dev/null +++ b/changes/prop335 @@ -0,0 +1,11 @@ + o Major features (directory authority): + - Authorities can now be configured to label relays as "MiddleOnly". + When voting for this flag, authorities automatically vote against + Exit, Guard, HSDir, and V2Dir; and in favor of BadExit. + Implements part of proposal 335. Based on a patch from Neel + Chauhan. + - Add a new consensus method to handle MiddleOnly specially. When + enough authorities are using this method, then any relay + tagged with the MiddleOnly flag will have its Exit, Guard, HSDir, + and V2Dir flags automatically cleared, and will have its BadExit flag + automatically set. Implements part of proposal 335. diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index 551ead7533..149d35b018 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -3025,6 +3025,11 @@ on the public Tor network. is the same as for exit policies, except that you don't need to say "accept" or "reject", and ports are not needed.) +[[AuthDirMiddleOnly]] **AuthMiddleOnly** __AddressPattern...__:: + Authoritative directories only. A set of address patterns for servers that + will be listed as middle-only in any network status document this authority + publishes, if **AuthDirListMiddleOnly** is set. + + [[AuthDirFastGuarantee]] **AuthDirFastGuarantee** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: Authoritative directories only. If non-zero, always vote the Fast flag for any relay advertising this amount of capacity or @@ -3072,6 +3077,13 @@ on the public Tor network. 1 unless you plan to list non-functioning exits as bad; otherwise, you are effectively voting in favor of every declared exit as an exit.) +[[AuthDirListMiddleOnly]] **AuthDirListMiddleOnly** **0**|**1**:: + Authoritative directories only. If set to 1, this directory has some + opinion about which nodes should only be used in the middle position. + (Do not set this to 1 unless you plan to list questionable relays + as "middle only"; otherwise, you are effectively voting _against_ + middle-only status for every relay.) + [[AuthDirMaxServersPerAddr]] **AuthDirMaxServersPerAddr** __NUM__:: Authoritative directories only. The maximum number of servers that we will list as acceptable on a single IP address. Set this to "0" for "no limit". @@ -3090,18 +3102,20 @@ on the public Tor network. authority publishes, or accepted as an OR address in any descriptor submitted for publication by this authority. +[[AuthDirRejectRequestsUnderLoad]] **AuthDirRejectRequestsUnderLoad** **0**|**1**:: + If set, the directory authority will start rejecting directory requests + from non relay connections by sending a 503 error code if it is under + bandwidth pressure (reaching the configured limit if any). Relays will + always tried to be answered even if this is on. (Default: 1) + //Out of order because it logically belongs with the other CCs options. [[AuthDirBadExitCCs]] **AuthDirBadExitCCs** __CC__,... + //Out of order because it logically belongs with the other CCs options. [[AuthDirInvalidCCs]] **AuthDirInvalidCCs** __CC__,... + - -[[AuthDirRejectRequestsUnderLoad]] **AuthDirRejectRequestsUnderLoad** **0**|**1**:: - If set, the directory authority will start rejecting directory requests - from non relay connections by sending a 503 error code if it is under - bandwidth pressure (reaching the configured limit if any). Relays will - always tried to be answered even if this is on. (Default: 1) +//Out of order because it logically belongs with the other CCs options. +[[AuthDirMiddleOnlytCCs]] **AuthDirMiddleOnlyCCs** __CC__,... + [[AuthDirRejectCCs]] **AuthDirRejectCCs** __CC__,...:: Authoritative directories only. These options contain a comma-separated @@ -3847,7 +3861,8 @@ __DataDirectory__/**`approved-routers`**:: descriptors are accepted, but marked in the vote as not valid. If it is **!badexit**, then the authority will vote for it to receive a BadExit flag, indicating that it shouldn't be used for traffic leaving - the Tor network. + the Tor network. If it is **!middleonly**, then the authority will + vote for it to only be used in the middle of circuits. (Neither rejected nor invalid relays are included in the consensus.) __DataDirectory__/**`v3-status-votes`**::

1 0

[tor/main] Implement a MiddleOnly flag for vote generation.
by ahf＠torproject.org 21 Oct '21

21 Oct '21

commit fc542167cb568fc3805275e2405990423cf87e3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 8 11:14:53 2021 -0400 Implement a MiddleOnly flag for vote generation. This proposal implements part of Prop335; it's based on a patch from Neel Chauhan. When configured to do so, authorities will assign a MiddleOnly flag to certain relays. Any relay which an authority gives this flag will not get Exit, V2Dir, Guard, or HSDir, and might get BadExit if the authority votes for that one. --- src/app/config/config.c | 3 +++ src/app/config/or_options_st.h | 4 ++++ src/core/or/policies.c | 22 ++++++++++++++++++++++ src/core/or/policies.h | 1 + src/feature/dirauth/dirauth_options.inc | 4 ++++ src/feature/dirauth/dirvote.c | 11 ++++++++--- src/feature/dirauth/process_descs.c | 15 +++++++++++++++ src/feature/dirauth/process_descs.h | 3 ++- src/feature/dirauth/voteflags.c | 11 ++++++++++- src/feature/dirauth/voteflags.h | 3 ++- src/feature/dirparse/ns_parse.c | 2 ++ src/feature/nodelist/fmt_routerstatus.c | 3 ++- src/feature/nodelist/node_st.h | 2 ++ src/feature/nodelist/routerstatus_st.h | 2 ++ src/test/test_voting_flags.c | 3 ++- 15 files changed, 81 insertions(+), 8 deletions(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index 15b4585954..8df5275cc6 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -193,6 +193,7 @@ static const config_abbrev_t option_abbrevs_[] = { PLURAL(AuthDirBadDirCC), PLURAL(AuthDirBadExitCC), PLURAL(AuthDirInvalidCC), + PLURAL(AuthDirMiddleOnlyCC), PLURAL(AuthDirRejectCC), PLURAL(EntryNode), PLURAL(ExcludeNode), @@ -331,6 +332,8 @@ static const config_var_t option_vars_[] = { V(AuthDirBadExitCCs, CSV, ""), V(AuthDirInvalid, LINELIST, NULL), V(AuthDirInvalidCCs, CSV, ""), + V(AuthDirMiddleOnly, LINELIST, NULL), + V(AuthDirMiddleOnlyCCs, CSV, ""), V(AuthDirReject, LINELIST, NULL), V(AuthDirRejectCCs, CSV, ""), OBSOLETE("AuthDirRejectUnlisted"), diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 812fa92cae..3a1acad044 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -499,6 +499,9 @@ struct or_options_t { struct smartlist_t *NodeFamilySets; struct config_line_t *AuthDirBadExit; /**< Address policy for descriptors to * mark as bad exits. */ + /** Address policy for descriptors to mark as only suitable for the + * middle position in circuits. */ + struct config_line_t *AuthDirMiddleOnly; struct config_line_t *AuthDirReject; /**< Address policy for descriptors to * reject. */ struct config_line_t *AuthDirInvalid; /**< Address policy for descriptors to @@ -512,6 +515,7 @@ struct or_options_t { */ struct smartlist_t *AuthDirBadExitCCs; struct smartlist_t *AuthDirInvalidCCs; + struct smartlist_t *AuthDirMiddleOnlyCCs; struct smartlist_t *AuthDirRejectCCs; /**@}*/ diff --git a/src/core/or/policies.c b/src/core/or/policies.c index f91c23ad31..a53849b4d0 100644 --- a/src/core/or/policies.c +++ b/src/core/or/policies.c @@ -59,6 +59,9 @@ static smartlist_t *authdir_invalid_policy = NULL; /** Policy that addresses for incoming router descriptors must <b>not</b> * match in order to not be marked as BadExit. */ static smartlist_t *authdir_badexit_policy = NULL; +/** Policy that addresses for incoming router descriptors must <b>not</b> + * match in order to not be marked as MiddleOnly. */ +static smartlist_t *authdir_middleonly_policy = NULL; /** Parsed addr_policy_t describing which addresses we believe we can start * circuits at. */ @@ -1119,6 +1122,17 @@ authdir_policy_badexit_address(const tor_addr_t *addr, uint16_t port) return addr_is_in_cc_list(addr, get_options()->AuthDirBadExitCCs); } +/** Return 1 if <b>addr</b>:<b>port</b> should be marked as MiddleOnly, + * based on <b>authdir_middleonly_policy</b>. Else return 0. + */ +int +authdir_policy_middleonly_address(const tor_addr_t *addr, uint16_t port) +{ + if (!addr_policy_permits_tor_addr(addr, port, authdir_middleonly_policy)) + return 1; + return addr_is_in_cc_list(addr, get_options()->AuthDirMiddleOnlyCCs); +} + #define REJECT(arg) \ STMT_BEGIN *msg = tor_strdup(arg); goto err; STMT_END @@ -1173,6 +1187,9 @@ validate_addr_policies(const or_options_t *options, char **msg) if (parse_addr_policy(options->AuthDirBadExit, &addr_policy, ADDR_POLICY_REJECT)) REJECT("Error in AuthDirBadExit entry."); + if (parse_addr_policy(options->AuthDirMiddleOnly, &addr_policy, + ADDR_POLICY_REJECT)) + REJECT("Error in AuthDirMiddleOnly entry."); if (parse_addr_policy(options->ReachableAddresses, &addr_policy, ADDR_POLICY_ACCEPT)) @@ -1266,6 +1283,9 @@ policies_parse_from_options(const or_options_t *options) if (load_policy_from_option(options->AuthDirBadExit, "AuthDirBadExit", &authdir_badexit_policy, ADDR_POLICY_REJECT) < 0) ret = -1; + if (load_policy_from_option(options->AuthDirMiddleOnly, "AuthDirMiddleOnly", + &authdir_middleonly_policy, ADDR_POLICY_REJECT) < 0) + ret = -1; if (parse_metrics_port_policy(options) < 0) { ret = -1; } @@ -3112,6 +3132,8 @@ policies_free_all(void) authdir_invalid_policy = NULL; addr_policy_list_free(authdir_badexit_policy); authdir_badexit_policy = NULL; + addr_policy_list_free(authdir_middleonly_policy); + authdir_middleonly_policy = NULL; if (!HT_EMPTY(&policy_root)) { policy_map_ent_t **ent; diff --git a/src/core/or/policies.h b/src/core/or/policies.h index a32f50ab1d..e11e1d0ff5 100644 --- a/src/core/or/policies.h +++ b/src/core/or/policies.h @@ -106,6 +106,7 @@ int metrics_policy_permits_address(const tor_addr_t *addr); int authdir_policy_permits_address(const tor_addr_t *addr, uint16_t port); int authdir_policy_valid_address(const tor_addr_t *addr, uint16_t port); int authdir_policy_badexit_address(const tor_addr_t *addr, uint16_t port); +int authdir_policy_middleonly_address(const tor_addr_t *addr, uint16_t port); int validate_addr_policies(const or_options_t *options, char **msg); void policy_expand_private(smartlist_t **policy); diff --git a/src/feature/dirauth/dirauth_options.inc b/src/feature/dirauth/dirauth_options.inc index 05726b8c2f..968f8e6c3d 100644 --- a/src/feature/dirauth/dirauth_options.inc +++ b/src/feature/dirauth/dirauth_options.inc @@ -27,6 +27,10 @@ CONF_VAR(AuthDirHasIPv6Connectivity, BOOL, 0, "0") * good. */ CONF_VAR(AuthDirListBadExits, BOOL, 0, "0") +/** True iff we should list middle-only relays, and vote for all other + * relays as possibly suitable for other positions. */ +CONF_VAR(AuthDirListMiddleOnly, BOOL, 0, "0") + /** Do not permit more than this number of servers per IP address. */ CONF_VAR(AuthDirMaxServersPerAddr, POSINT, 0, "2") diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index ffaa78b997..4f8cf2b8e6 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -4581,6 +4581,7 @@ const char DIRVOTE_UNIVERSAL_FLAGS[] = * depending on our configuration. */ const char DIRVOTE_OPTIONAL_FLAGS[] = "BadExit " + "MiddleOnly " "Running"; /** Return a new networkstatus_t* containing our current opinion. (For v3 @@ -4598,7 +4599,8 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, smartlist_t *routers, *routerstatuses; char identity_digest[DIGEST_LEN]; char signing_key_digest[DIGEST_LEN]; - const int listbadexits = d_options->AuthDirListBadExits; + const int list_bad_exits = d_options->AuthDirListBadExits; + const int list_middle_only = d_options->AuthDirListMiddleOnly; routerlist_t *rl = router_get_routerlist(); time_t now = time(NULL); time_t cutoff = now - ROUTER_MAX_AGE_TO_PUBLISH; @@ -4703,7 +4705,8 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, vrs = tor_malloc_zero(sizeof(vote_routerstatus_t)); rs = &vrs->status; dirauth_set_routerstatus_from_routerinfo(rs, node, ri, now, - listbadexits); + list_bad_exits, + list_middle_only); if (ri->cache_info.signing_key_cert) { memcpy(vrs->ed25519_id, @@ -4827,8 +4830,10 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, 0, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); if (vote_on_reachability) smartlist_add_strdup(v3_out->known_flags, "Running"); - if (listbadexits) + if (list_bad_exits) smartlist_add_strdup(v3_out->known_flags, "BadExit"); + if (list_middle_only) + smartlist_add_strdup(v3_out->known_flags, "MiddleOnly"); smartlist_sort_strings(v3_out->known_flags); if (d_options->ConsensusParams) { diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index eca987b8b5..db4eca5329 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -226,6 +226,8 @@ dirserv_load_fingerprint_file(void) add_status = RTR_BADEXIT; } else if (!strcasecmp(nickname, "!invalid")) { add_status = RTR_INVALID; + } else if (!strcasecmp(nickname, "!middleonly")) { + add_status = RTR_MIDDLEONLY; } /* Check if fingerprint is RSA or ed25519 by verifying it. */ @@ -496,6 +498,13 @@ dirserv_get_status_impl(const char *id_digest, result |= RTR_BADEXIT; } + if (authdir_policy_middleonly_address(ipv4_addr, ipv4_orport)) { + log_fn(severity, LD_DIRSERV, + "Marking '%s' as middle-only because of address '%s'", + nickname, fmt_addr(ipv4_addr)); + result |= RTR_MIDDLEONLY; + } + if (!authdir_policy_permits_address(ipv4_addr, ipv4_orport)) { log_fn(severity, LD_DIRSERV, "Rejecting '%s' because of address '%s'", nickname, fmt_addr(ipv4_addr)); @@ -630,6 +639,7 @@ dirserv_set_node_flags_from_authoritative_status(node_t *node, { node->is_valid = (authstatus & RTR_INVALID) ? 0 : 1; node->is_bad_exit = (authstatus & RTR_BADEXIT) ? 1 : 0; + node->is_middle_only = (authstatus & RTR_MIDDLEONLY) ? 1 : 0; } /** True iff <b>a</b> is more severe than <b>b</b>. */ @@ -963,6 +973,11 @@ directory_remove_invalid(void) (r & RTR_BADEXIT) ? "bad" : "good"); node->is_bad_exit = (r&RTR_BADEXIT) ? 1: 0; } + if (bool_neq((r & RTR_MIDDLEONLY), node->is_middle_only)) { + log_info(LD_DIRSERV, "Router '%s' is now %smiddle-only", description, + (r & RTR_MIDDLEONLY) ? "" : "not"); + node->is_middle_only = (r&RTR_MIDDLEONLY) ? 1: 0; + } } SMARTLIST_FOREACH_END(node); routerlist_assert_ok(rl); diff --git a/src/feature/dirauth/process_descs.h b/src/feature/dirauth/process_descs.h index 6c056d11dd..a509eb1fbe 100644 --- a/src/feature/dirauth/process_descs.h +++ b/src/feature/dirauth/process_descs.h @@ -45,7 +45,8 @@ typedef struct authdir_config_t { #define RTR_REJECT 4 /**< We will not publish this router. */ /* 8 Historically used to avoid using this as a dir. */ #define RTR_BADEXIT 16 /**< We'll tell clients not to use this as an exit. */ -/* 32 Historically used to indicade Unnamed */ +/** We'll vote to only use this router as a midpoint. */ +#define RTR_MIDDLEONLY 32 #endif /* defined(PROCESS_DESCS_PRIVATE) || defined(TOR_UNIT_TESTS) */ diff --git a/src/feature/dirauth/voteflags.c b/src/feature/dirauth/voteflags.c index d755a270be..05c19ff501 100644 --- a/src/feature/dirauth/voteflags.c +++ b/src/feature/dirauth/voteflags.c @@ -565,7 +565,8 @@ dirauth_set_routerstatus_from_routerinfo(routerstatus_t *rs, node_t *node, const routerinfo_t *ri, time_t now, - int listbadexits) + int listbadexits, + int listmiddleonly) { const or_options_t *options = get_options(); uint32_t routerbw_kb = dirserv_get_credible_bandwidth_kb(ri); @@ -597,6 +598,14 @@ dirauth_set_routerstatus_from_routerinfo(routerstatus_t *rs, /* Override rs->is_bad_exit */ rs->is_bad_exit = listbadexits && node->is_bad_exit; + /* Override rs->is_middle_only and related flags. */ + rs->is_middle_only = listmiddleonly && node->is_middle_only; + if (rs->is_middle_only) { + if (listbadexits) + rs->is_bad_exit = 1; + rs->is_exit = rs->is_possible_guard = rs->is_hs_dir = rs->is_v2_dir = 0; + } + /* Set rs->is_staledesc. */ rs->is_staledesc = (ri->cache_info.published_on + DESC_IS_STALE_INTERVAL) < now; diff --git a/src/feature/dirauth/voteflags.h b/src/feature/dirauth/voteflags.h index 818a0bafd2..8371f1c315 100644 --- a/src/feature/dirauth/voteflags.h +++ b/src/feature/dirauth/voteflags.h @@ -22,7 +22,8 @@ void dirauth_set_routerstatus_from_routerinfo(routerstatus_t *rs, node_t *node, const routerinfo_t *ri, time_t now, - int listbadexits); + int listbadexits, + int listmiddleonly); void dirserv_compute_performance_thresholds(digestmap_t *omit_as_sybil); #endif /* defined(HAVE_MODULE_DIRAUTH) */ diff --git a/src/feature/dirparse/ns_parse.c b/src/feature/dirparse/ns_parse.c index 947b3810a4..cd3e2731be 100644 --- a/src/feature/dirparse/ns_parse.c +++ b/src/feature/dirparse/ns_parse.c @@ -434,6 +434,8 @@ routerstatus_parse_entry_from_string(memarea_t *area, rs->is_possible_guard = 1; else if (!strcmp(tok->args[i], "BadExit")) rs->is_bad_exit = 1; + else if (!strcmp(tok->args[i], "MiddleOnly")) + rs->is_middle_only = 1; else if (!strcmp(tok->args[i], "Authority")) rs->is_authority = 1; else if (!strcmp(tok->args[i], "Unnamed") && diff --git a/src/feature/nodelist/fmt_routerstatus.c b/src/feature/nodelist/fmt_routerstatus.c index 6db40c0b68..95379a7721 100644 --- a/src/feature/nodelist/fmt_routerstatus.c +++ b/src/feature/nodelist/fmt_routerstatus.c @@ -87,7 +87,7 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, goto done; smartlist_add_asprintf(chunks, - "s%s%s%s%s%s%s%s%s%s%s%s%s\n", + "s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", /* These must stay in alphabetical order. */ rs->is_authority?" Authority":"", rs->is_bad_exit?" BadExit":"", @@ -95,6 +95,7 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, rs->is_fast?" Fast":"", rs->is_possible_guard?" Guard":"", rs->is_hs_dir?" HSDir":"", + rs->is_middle_only?" MiddleOnly":"", rs->is_flagged_running?" Running":"", rs->is_stable?" Stable":"", rs->is_staledesc?" StaleDesc":"", diff --git a/src/feature/nodelist/node_st.h b/src/feature/nodelist/node_st.h index b15e7154c4..df67a47ada 100644 --- a/src/feature/nodelist/node_st.h +++ b/src/feature/nodelist/node_st.h @@ -70,6 +70,8 @@ struct node_t { unsigned int is_exit:1; /**< Do we think this is an OK exit? */ unsigned int is_bad_exit:1; /**< Do we think this exit is censored, borked, * or otherwise nasty? */ + /** Is this unsuitable for use as anything besides a middle relay? */ + unsigned int is_middle_only:1; unsigned int is_hs_dir:1; /**< True iff this router is a hidden service * directory according to the authorities. */ diff --git a/src/feature/nodelist/routerstatus_st.h b/src/feature/nodelist/routerstatus_st.h index 46ff0bdeac..55b76de581 100644 --- a/src/feature/nodelist/routerstatus_st.h +++ b/src/feature/nodelist/routerstatus_st.h @@ -51,6 +51,8 @@ struct routerstatus_t { * choice as an entry guard. */ unsigned int is_bad_exit:1; /**< True iff this node is a bad choice for * an exit node. */ + unsigned int is_middle_only:1; /**< True iff this node is marked as bad + * for anything besides middle positions. */ unsigned int is_hs_dir:1; /**< True iff this router is a v2-or-later hidden * service directory. */ unsigned int is_v2_dir:1; /** True iff this router publishes an open DirPort diff --git a/src/test/test_voting_flags.c b/src/test/test_voting_flags.c index 4c5f3a3270..457b0fa796 100644 --- a/src/test/test_voting_flags.c +++ b/src/test/test_voting_flags.c @@ -62,7 +62,8 @@ check_result(flag_vote_test_cfg_t *c) bool result = false; routerstatus_t rs; memset(&rs, 0, sizeof(rs)); - dirauth_set_routerstatus_from_routerinfo(&rs, &c->node, &c->ri, c->now, 0); + dirauth_set_routerstatus_from_routerinfo(&rs, &c->node, &c->ri, c->now, + 0, 0); tt_i64_op(rs.published_on, OP_EQ, c->expected.published_on); tt_str_op(rs.nickname, OP_EQ, c->expected.nickname);

1 0