Merge remote-tracking branch 'origin/master'

# Conflicts:
#	hosts

hosts

@@ -3840,6 +3840,9 @@
 2001:660:302a:1::e r3---sn-gxo5uxg-jqbe.googlevideo.com
 2001:660:302a:1::f r4---sn-gxo5uxg-jqbe.googlevideo.com
 
+2001:7f8:23:50::c r1---sn-uv2pm-ugoe.googlevideo.com
+2001:7f8:23:50::d r2---sn-uv2pm-ugoe.googlevideo.com
+2001:7f8:23:50::e r3---sn-uv2pm-ugoe.googlevideo.com
 2001:7f8:49:1::c r1---sn-gvopm-vu2e.googlevideo.com
 2001:7f8:49:1::d r2---sn-gvopm-vu2e.googlevideo.com
 2001:7f8:49:1::e r3---sn-gvopm-vu2e.googlevideo.com
@@ -9787,6 +9790,36 @@
 2607:f8b0:4007:1b::17 r18---sn-a5m7lner.googlevideo.com
 2607:f8b0:4007:1b::18 r19---sn-a5m7lner.googlevideo.com
 2607:f8b0:4007:1b::19 r20---sn-a5m7lner.googlevideo.com
+2607:f8b0:4007:21::7 r1---sn-a5mlrn7l.googlevideo.com
+2607:f8b0:4007:21::8 r2---sn-a5mlrn7l.googlevideo.com
+2607:f8b0:4007:21::9 r3---sn-a5mlrn7l.googlevideo.com
+2607:f8b0:4007:21::a r4---sn-a5mlrn7l.googlevideo.com
+2607:f8b0:4007:21::b r5---sn-a5mlrn7l.googlevideo.com
+2607:f8b0:4007:21::c r6---sn-a5mlrn7l.googlevideo.com
+2607:f8b0:4007:22::7 r1---sn-a5mlrn7s.googlevideo.com
+2607:f8b0:4007:22::8 r2---sn-a5mlrn7s.googlevideo.com
+2607:f8b0:4007:22::9 r3---sn-a5mlrn7s.googlevideo.com
+2607:f8b0:4007:22::a r4---sn-a5mlrn7s.googlevideo.com
+2607:f8b0:4007:22::b r5---sn-a5mlrn7s.googlevideo.com
+2607:f8b0:4007:22::c r6---sn-a5mlrn7s.googlevideo.com
+2607:f8b0:4007:23::7 r1---sn-a5mlrn7z.googlevideo.com
+2607:f8b0:4007:23::8 r2---sn-a5mlrn7z.googlevideo.com
+2607:f8b0:4007:23::9 r3---sn-a5mlrn7z.googlevideo.com
+2607:f8b0:4007:23::a r4---sn-a5mlrn7z.googlevideo.com
+2607:f8b0:4007:23::b r5---sn-a5mlrn7z.googlevideo.com
+2607:f8b0:4007:23::c r6---sn-a5mlrn7z.googlevideo.com
+2607:f8b0:4007:24::7 r1---sn-a5mlrn76.googlevideo.com
+2607:f8b0:4007:24::8 r2---sn-a5mlrn76.googlevideo.com
+2607:f8b0:4007:24::9 r3---sn-a5mlrn76.googlevideo.com
+2607:f8b0:4007:24::a r4---sn-a5mlrn76.googlevideo.com
+2607:f8b0:4007:24::b r5---sn-a5mlrn76.googlevideo.com
+2607:f8b0:4007:24::c r6---sn-a5mlrn76.googlevideo.com
+2607:f8b0:4007:25::7 r1---sn-a5mekned.googlevideo.com
+2607:f8b0:4007:25::8 r2---sn-a5mekned.googlevideo.com
+2607:f8b0:4007:25::9 r3---sn-a5mekned.googlevideo.com
+2607:f8b0:4007:25::a r4---sn-a5mekned.googlevideo.com
+2607:f8b0:4007:25::b r5---sn-a5mekned.googlevideo.com
+2607:f8b0:4007:25::c r6---sn-a5mekned.googlevideo.com
 2607:f8b0:4007:400::10 r1---sn-a5m7zu7e.googlevideo.com
 2607:f8b0:4007:400::11 r2---sn-a5m7zu7e.googlevideo.com
 2607:f8b0:4007:400::12 r3---sn-a5m7zu7e.googlevideo.com

snippets/01_google.txt

@@ -1062,3 +1062,4 @@
 2404:6800:4005:80b::2003 certificate-transparency.org
 2404:6800:4005:80b::2003 www.certificate-transparency.org
 2404:6800:4008:c00::79 code.getmdl.io #ghs.l.google.com
+

snippets/08_googlevideo.txt

@@ -1156,6 +1156,9 @@
 2001:660:302a:1::e r3---sn-gxo5uxg-jqbe.googlevideo.com
 2001:660:302a:1::f r4---sn-gxo5uxg-jqbe.googlevideo.com
 
+2001:7f8:23:50::c r1---sn-uv2pm-ugoe.googlevideo.com
+2001:7f8:23:50::d r2---sn-uv2pm-ugoe.googlevideo.com
+2001:7f8:23:50::e r3---sn-uv2pm-ugoe.googlevideo.com
 2001:7f8:49:1::c r1---sn-gvopm-vu2e.googlevideo.com
 2001:7f8:49:1::d r2---sn-gvopm-vu2e.googlevideo.com
 2001:7f8:49:1::e r3---sn-gvopm-vu2e.googlevideo.com
@@ -7103,6 +7106,36 @@
 2607:f8b0:4007:1b::17 r18---sn-a5m7lner.googlevideo.com
 2607:f8b0:4007:1b::18 r19---sn-a5m7lner.googlevideo.com
 2607:f8b0:4007:1b::19 r20---sn-a5m7lner.googlevideo.com
+2607:f8b0:4007:21::7 r1---sn-a5mlrn7l.googlevideo.com
+2607:f8b0:4007:21::8 r2---sn-a5mlrn7l.googlevideo.com
+2607:f8b0:4007:21::9 r3---sn-a5mlrn7l.googlevideo.com
+2607:f8b0:4007:21::a r4---sn-a5mlrn7l.googlevideo.com
+2607:f8b0:4007:21::b r5---sn-a5mlrn7l.googlevideo.com
+2607:f8b0:4007:21::c r6---sn-a5mlrn7l.googlevideo.com
+2607:f8b0:4007:22::7 r1---sn-a5mlrn7s.googlevideo.com
+2607:f8b0:4007:22::8 r2---sn-a5mlrn7s.googlevideo.com
+2607:f8b0:4007:22::9 r3---sn-a5mlrn7s.googlevideo.com
+2607:f8b0:4007:22::a r4---sn-a5mlrn7s.googlevideo.com
+2607:f8b0:4007:22::b r5---sn-a5mlrn7s.googlevideo.com
+2607:f8b0:4007:22::c r6---sn-a5mlrn7s.googlevideo.com
+2607:f8b0:4007:23::7 r1---sn-a5mlrn7z.googlevideo.com
+2607:f8b0:4007:23::8 r2---sn-a5mlrn7z.googlevideo.com
+2607:f8b0:4007:23::9 r3---sn-a5mlrn7z.googlevideo.com
+2607:f8b0:4007:23::a r4---sn-a5mlrn7z.googlevideo.com
+2607:f8b0:4007:23::b r5---sn-a5mlrn7z.googlevideo.com
+2607:f8b0:4007:23::c r6---sn-a5mlrn7z.googlevideo.com
+2607:f8b0:4007:24::7 r1---sn-a5mlrn76.googlevideo.com
+2607:f8b0:4007:24::8 r2---sn-a5mlrn76.googlevideo.com
+2607:f8b0:4007:24::9 r3---sn-a5mlrn76.googlevideo.com
+2607:f8b0:4007:24::a r4---sn-a5mlrn76.googlevideo.com
+2607:f8b0:4007:24::b r5---sn-a5mlrn76.googlevideo.com
+2607:f8b0:4007:24::c r6---sn-a5mlrn76.googlevideo.com
+2607:f8b0:4007:25::7 r1---sn-a5mekned.googlevideo.com
+2607:f8b0:4007:25::8 r2---sn-a5mekned.googlevideo.com
+2607:f8b0:4007:25::9 r3---sn-a5mekned.googlevideo.com
+2607:f8b0:4007:25::a r4---sn-a5mekned.googlevideo.com
+2607:f8b0:4007:25::b r5---sn-a5mekned.googlevideo.com
+2607:f8b0:4007:25::c r6---sn-a5mekned.googlevideo.com
 2607:f8b0:4007:400::10 r1---sn-a5m7zu7e.googlevideo.com
 2607:f8b0:4007:400::11 r2---sn-a5m7zu7e.googlevideo.com
 2607:f8b0:4007:400::12 r3---sn-a5m7zu7e.googlevideo.com
@@ -17701,4 +17734,5 @@
 2a00:1450:401e:3f::9 r3---sn-4g5edn7z.googlevideo.com
 2a00:1450:401e:3f::a r4---sn-4g5edn7z.googlevideo.com
 2a00:1450:401e:3f::b r5---sn-4g5edn7z.googlevideo.com
-2a00:1450:401e:3f::c r6---sn-4g5edn7z.googlevideo.com
+2a00:1450:401e:3f::c r6---sn-4g5edn7z.googlevideo.com
+

tools/conv.py

@@ -73,8 +73,11 @@ def main():
         ret += iata2sn(input[:-1])
         ret += num2code(input[-1])
     elif sys.argv[1] == '-g':
-        ret += sn2iata(input[:-1])
-        ret += code2num(input[-1])
+        lst = input.split('-')
+        ret += sn2iata(lst[0])
+        ret += "-"
+        ret += sn2iata(lst[1][0:3])
+        ret += code2num(lst[1][3:])
     else:
         print 'Unknown option.'
         sys.exit(1)