From 6199ac5fbec7f8a862440a8b65f7f299de4c2dbf Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 19 Nov 2010 22:22:43 -0500
Subject: [PATCH 01/47] Do not send Libevent log messages to a controller.

Doing so could make Libevent call Libevent from inside a Libevent
logging call, which is a recipe for reentrant confusion and
hard-to-debug crashes.  This would especially hurt if Libevent
debug-level logging is enabled AND the user has a controller
watching for low-severity log messages.

Fix bug 2190; fix on 0.1.0.2-rc.
---
 changes/bug2190              |  6 ++++++
 src/common/compat_libevent.c | 10 +++++-----
 src/common/log.c             |  4 ++++
 src/common/torlog.h          |  4 ++++
 4 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 changes/bug2190

diff --git a/changes/bug2190 b/changes/bug2190
new file mode 100644
index 000000000..92ecba7eb
--- /dev/null
+++ b/changes/bug2190
@@ -0,0 +1,6 @@
+  o Minor bugfixes
+    - Prevent calls from Libevent from inside Libevent log handlers.
+      This had potential to cause a nasty set of crashes, especially if
+      running Libevent with debug logging enabled, and running Tor
+      with a controller watching for low-severity log messages.
+      Bugfix on 0.1.0.2-rc.  Fixes bug 2190.
diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c
index 250fa2bdb..96843c73e 100644
--- a/src/common/compat_libevent.c
+++ b/src/common/compat_libevent.c
@@ -65,19 +65,19 @@ libevent_logging_callback(int severity, const char *msg)
   }
   switch (severity) {
     case _EVENT_LOG_DEBUG:
-      log(LOG_DEBUG, LD_NET, "Message from libevent: %s", buf);
+      log(LOG_DEBUG, LD_NOCB|LD_NET, "Message from libevent: %s", buf);
       break;
     case _EVENT_LOG_MSG:
-      log(LOG_INFO, LD_NET, "Message from libevent: %s", buf);
+      log(LOG_INFO, LD_NOCB|LD_NET, "Message from libevent: %s", buf);
       break;
     case _EVENT_LOG_WARN:
-      log(LOG_WARN, LD_GENERAL, "Warning from libevent: %s", buf);
+      log(LOG_WARN, LD_NOCB|LD_GENERAL, "Warning from libevent: %s", buf);
       break;
     case _EVENT_LOG_ERR:
-      log(LOG_ERR, LD_GENERAL, "Error from libevent: %s", buf);
+      log(LOG_ERR, LD_NOCB|LD_GENERAL, "Error from libevent: %s", buf);
       break;
     default:
-      log(LOG_WARN, LD_GENERAL, "Message [%d] from libevent: %s",
+      log(LOG_WARN, LD_NOCB|LD_GENERAL, "Message [%d] from libevent: %s",
           severity, buf);
       break;
   }
diff --git a/src/common/log.c b/src/common/log.c
index b639e7a78..0ccda5388 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -278,6 +278,10 @@ logv(int severity, log_domain_mask_t domain, const char *funcname,
       lf = lf->next;
       continue;
     }
+    if (lf->callback && (domain & LD_NOCB)) {
+      lf = lf->next;
+      continue;
+    }
     if (lf->seems_dead) {
       lf = lf->next;
       continue;
diff --git a/src/common/torlog.h b/src/common/torlog.h
index 21219569e..8b6cd1bf0 100644
--- a/src/common/torlog.h
+++ b/src/common/torlog.h
@@ -95,6 +95,10 @@
 /** Number of logging domains in the code. */
 #define N_LOGGING_DOMAINS 20
 
+/** This log message is not safe to send to a callback-based logger.
+ * Used as a flag, not a log domain. */
+#define LD_NOCB (1u<<31)
+
 typedef uint32_t log_domain_mask_t;
 
 /** Configures which severities are logged for each logging domain for a given

From 668f7a2639faf59e5bc4f2615e61e0e768e0b26d Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 19 Nov 2010 22:22:43 -0500
Subject: [PATCH 02/47] Do not send Libevent log messages to a controller
 (0.2.1 backport)

Doing so could make Libevent call Libevent from inside a Libevent
logging call, which is a recipe for reentrant confusion and
hard-to-debug crashes.  This would especially hurt if Libevent
debug-level logging is enabled AND the user has a controller
watching for low-severity log messages.

Fix bug 2190; fix on 0.1.0.2-rc.
---
 changes/bug2190  |  6 ++++++
 src/common/log.c | 14 +++++++++-----
 src/common/log.h |  4 ++++
 3 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 changes/bug2190

diff --git a/changes/bug2190 b/changes/bug2190
new file mode 100644
index 000000000..92ecba7eb
--- /dev/null
+++ b/changes/bug2190
@@ -0,0 +1,6 @@
+  o Minor bugfixes
+    - Prevent calls from Libevent from inside Libevent log handlers.
+      This had potential to cause a nasty set of crashes, especially if
+      running Libevent with debug logging enabled, and running Tor
+      with a controller watching for low-severity log messages.
+      Bugfix on 0.1.0.2-rc.  Fixes bug 2190.
diff --git a/src/common/log.c b/src/common/log.c
index 6baef8e26..da55f4fe0 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -280,6 +280,10 @@ logv(int severity, log_domain_mask_t domain, const char *funcname,
       lf = lf->next;
       continue;
     }
+    if (lf->callback && (domain & LD_NOCB)) {
+      lf = lf->next;
+      continue;
+    }
     if (lf->seems_dead) {
       lf = lf->next;
       continue;
@@ -943,19 +947,19 @@ libevent_logging_callback(int severity, const char *msg)
   }
   switch (severity) {
     case _EVENT_LOG_DEBUG:
-      log(LOG_DEBUG, LD_NET, "Message from libevent: %s", buf);
+      log(LOG_DEBUG, LD_NOCB|LD_NET, "Message from libevent: %s", buf);
       break;
     case _EVENT_LOG_MSG:
-      log(LOG_INFO, LD_NET, "Message from libevent: %s", buf);
+      log(LOG_INFO, LD_NOCB|LD_NET, "Message from libevent: %s", buf);
       break;
     case _EVENT_LOG_WARN:
-      log(LOG_WARN, LD_GENERAL, "Warning from libevent: %s", buf);
+      log(LOG_WARN, LD_NOCB|LD_GENERAL, "Warning from libevent: %s", buf);
       break;
     case _EVENT_LOG_ERR:
-      log(LOG_ERR, LD_GENERAL, "Error from libevent: %s", buf);
+      log(LOG_ERR, LD_NOCB|LD_GENERAL, "Error from libevent: %s", buf);
       break;
     default:
-      log(LOG_WARN, LD_GENERAL, "Message [%d] from libevent: %s",
+      log(LOG_WARN, LD_NOCB|LD_GENERAL, "Message [%d] from libevent: %s",
           severity, buf);
       break;
   }
diff --git a/src/common/log.h b/src/common/log.h
index 6a45fc3d0..22b9e2474 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -94,6 +94,10 @@
 /** Number of logging domains in the code. */
 #define N_LOGGING_DOMAINS 19
 
+/** This log message is not safe to send to a callback-based logger.
+ * Used as a flag, not a log domain. */
+#define LD_NOCB (1u<<31)
+
 typedef uint32_t log_domain_mask_t;
 
 /** Configures which severities are logged for each logging domain for a given

From d166d18643197c57ba98d3a476df26c605554b26 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 19 Nov 2010 22:52:32 -0500
Subject: [PATCH 03/47] Better fix for 2190: defer libevent->controller
 messages instead of dropping

---
 changes/bug2190     |  5 ++++
 src/common/log.c    | 73 +++++++++++++++++++++++++++++++++++++++++----
 src/common/torlog.h |  5 ++--
 src/or/main.c       |  3 ++
 4 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/changes/bug2190 b/changes/bug2190
index 92ecba7eb..0591acb6f 100644
--- a/changes/bug2190
+++ b/changes/bug2190
@@ -4,3 +4,8 @@
       running Libevent with debug logging enabled, and running Tor
       with a controller watching for low-severity log messages.
       Bugfix on 0.1.0.2-rc.  Fixes bug 2190.
+    - Make Libevent log messages get delievered to controllers later,
+      and not from inside the Libevent log handler.  This prevents
+      unsafe reentrant Libevent calls while still letting the log
+      messages get through.
+
diff --git a/src/common/log.c b/src/common/log.c
index 0ccda5388..f26c5ef34 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -103,6 +103,17 @@ static logfile_t *logfiles = NULL;
 static int syslog_count = 0;
 #endif
 
+/** Represents a log message that we are going to send to callback-driven
+ * loggers once we can do so in a non-reentrant way. */
+typedef struct pending_cb_message_t {
+  int severity;
+  log_domain_mask_t domain;
+  char *msg;
+} pending_cb_message_t;
+
+/** Log messages waiting to be replayed onto callback-based logs */
+static smartlist_t *pending_cb_messages = NULL;
+
 #define LOCK_LOGS() STMT_BEGIN                                          \
   tor_mutex_acquire(&log_mutex);                                        \
   STMT_END
@@ -268,6 +279,10 @@ logv(int severity, log_domain_mask_t domain, const char *funcname,
    * interesting and hard to diagnose effects */
   assert(severity >= LOG_ERR && severity <= LOG_DEBUG);
   LOCK_LOGS();
+
+  if (smartlist_len(pending_cb_messages))
+    flush_pending_log_callbacks();
+
   lf = logfiles;
   while (lf) {
     if (! (lf->severities->masks[SEVERITY_MASK_IDX(severity)] & domain)) {
@@ -278,10 +293,6 @@ logv(int severity, log_domain_mask_t domain, const char *funcname,
       lf = lf->next;
       continue;
     }
-    if (lf->callback && (domain & LD_NOCB)) {
-      lf = lf->next;
-      continue;
-    }
     if (lf->seems_dead) {
       lf = lf->next;
       continue;
@@ -316,7 +327,15 @@ logv(int severity, log_domain_mask_t domain, const char *funcname,
       lf = lf->next;
       continue;
     } else if (lf->callback) {
-      lf->callback(severity, domain, end_of_prefix);
+      if (domain & LD_NOCB) {
+        pending_cb_message_t *msg = tor_malloc(sizeof(pending_cb_message_t));
+        msg->severity = severity;
+        msg->domain = domain;
+        msg->msg = tor_strdup(end_of_prefix);
+        smartlist_add(pending_cb_messages, msg);
+      } else {
+        lf->callback(severity, domain, end_of_prefix);
+      }
       lf = lf->next;
       continue;
     }
@@ -555,6 +574,8 @@ init_logging(void)
     tor_mutex_init(&log_mutex);
     log_mutex_initialized = 1;
   }
+  if (pending_cb_messages == NULL)
+    pending_cb_messages = smartlist_create();
 }
 
 /** Add a log handler to receive messages during startup (before the real
@@ -613,6 +634,48 @@ change_callback_log_severity(int loglevelMin, int loglevelMax,
   UNLOCK_LOGS();
 }
 
+/** If there are any log messages that were genered with LD_NOCB waiting to
+ * be sent to callback-based loggers, send them now. */
+void
+flush_pending_log_callbacks(void)
+{
+  logfile_t *lf;
+  smartlist_t *messages, *messages_tmp;
+
+  LOCK_LOGS();
+  if (0 == smartlist_len(pending_cb_messages)) {
+    UNLOCK_LOGS();
+    return;
+  }
+
+  messages = pending_cb_messages;
+  pending_cb_messages = smartlist_create();
+  do {
+    SMARTLIST_FOREACH_BEGIN(messages, pending_cb_message_t *, msg) {
+      const int severity = msg->severity;
+      const int domain = msg->domain;
+      for (lf = logfiles; lf; lf = lf->next) {
+        if (! lf->callback || lf->seems_dead ||
+            ! (lf->severities->masks[SEVERITY_MASK_IDX(severity)] & domain)) {
+          continue;
+        }
+        lf->callback(severity, domain, msg->msg);
+      }
+      tor_free(msg->msg);
+      tor_free(msg);
+    } SMARTLIST_FOREACH_END(msg);
+    smartlist_clear(messages);
+
+    messages_tmp = pending_cb_messages;
+    pending_cb_messages = messages;
+    messages = messages_tmp;
+  } while (smartlist_len(messages));
+
+  smartlist_free(messages);
+
+  UNLOCK_LOGS();
+}
+
 /** Close any log handlers added by add_temp_log() or marked by
  * mark_logs_temp(). */
 void
diff --git a/src/common/torlog.h b/src/common/torlog.h
index 8b6cd1bf0..73c690631 100644
--- a/src/common/torlog.h
+++ b/src/common/torlog.h
@@ -95,8 +95,8 @@
 /** Number of logging domains in the code. */
 #define N_LOGGING_DOMAINS 20
 
-/** This log message is not safe to send to a callback-based logger.
- * Used as a flag, not a log domain. */
+/** This log message is not safe to send to a callback-based logger
+ * immediately.  Used as a flag, not a log domain. */
 #define LD_NOCB (1u<<31)
 
 typedef uint32_t log_domain_mask_t;
@@ -141,6 +141,7 @@ void rollback_log_changes(void);
 void mark_logs_temp(void);
 void change_callback_log_severity(int loglevelMin, int loglevelMax,
                                   log_callback cb);
+void flush_pending_log_callbacks(void);
 void log_set_application_name(const char *name);
 
 /* Outputs a message to stdout */
diff --git a/src/or/main.c b/src/or/main.c
index 9bdbbc17a..e13215bd2 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -893,6 +893,9 @@ run_scheduled_events(time_t now)
     signewnym_impl(now);
   }
 
+  /* 0c. If we've deferred log messages for the controller, handle them now */
+  flush_pending_log_callbacks();
+
   /** 1a. Every MIN_ONION_KEY_LIFETIME seconds, rotate the onion keys,
    *  shut down and restart all cpuworkers, and update the directory if
    *  necessary.

From 12f31867190bde6fb2c4ff169d343e7bff00a503 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 22 Nov 2010 13:12:48 -0500
Subject: [PATCH 04/47] Disable DirPort when BridgeRelay is set

---
 changes/bug2060 | 4 ++++
 src/or/config.c | 6 ++++++
 2 files changed, 10 insertions(+)
 create mode 100644 changes/bug2060

diff --git a/changes/bug2060 b/changes/bug2060
new file mode 100644
index 000000000..eb95aedb2
--- /dev/null
+++ b/changes/bug2060
@@ -0,0 +1,4 @@
+  o Minor features
+    - Make sure to disable DirPort if running as a bridge.  DirPorts aren't
+      used on bridges, and it makes bridge scanning way too easy.
+
diff --git a/src/or/config.c b/src/or/config.c
index e3d5e606f..bd8c45758 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3281,6 +3281,12 @@ options_validate(or_options_t *old_options, or_options_t *options,
            "PublishServerDescriptor line.");
   }
 
+  if (options->BridgeRelay && options->DirPort) {
+    log_warn(LD_CONFIG, "Can't set a DirPort on a bridge relay; disabling "
+             "DirPort");
+    options->DirPort = 0;
+  }
+
   if (options->MinUptimeHidServDirectoryV2 < 0) {
     log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
                         "least 0 seconds. Changing to 0.");

From 4a9d60734ce47cb3b5cb254e522116cd26b4823f Mon Sep 17 00:00:00 2001
From: Robert Ransom <rransom.8774@gmail.com>
Date: Sat, 11 Dec 2010 04:41:35 -0800
Subject: [PATCH 05/47] Don't call flush_pending_log_callbacks while logging
 LD_NOCB messages.

Found by boboper.
---
 src/common/log.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/log.c b/src/common/log.c
index f26c5ef34..f63c3fb9b 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -280,7 +280,7 @@ logv(int severity, log_domain_mask_t domain, const char *funcname,
   assert(severity >= LOG_ERR && severity <= LOG_DEBUG);
   LOCK_LOGS();
 
-  if (smartlist_len(pending_cb_messages))
+  if ((! (domain & LD_NOCB)) && smartlist_len(pending_cb_messages))
     flush_pending_log_callbacks();
 
   lf = logfiles;

From cc051f9aca96b55533953cfcc10c86f9fe1e7b9a Mon Sep 17 00:00:00 2001
From: Robert Ransom <rransom.8774@gmail.com>
Date: Sat, 11 Dec 2010 05:26:36 -0800
Subject: [PATCH 06/47] Only add each log message to pending_cb_messages once.

---
 src/common/log.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/common/log.c b/src/common/log.c
index f63c3fb9b..1324ff08c 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -272,6 +272,7 @@ logv(int severity, log_domain_mask_t domain, const char *funcname,
   int formatted = 0;
   logfile_t *lf;
   char *end_of_prefix=NULL;
+  int callbacks_deferred = 0;
 
   /* Call assert, not tor_assert, since tor_assert calls log on failure. */
   assert(format);
@@ -328,11 +329,15 @@ logv(int severity, log_domain_mask_t domain, const char *funcname,
       continue;
     } else if (lf->callback) {
       if (domain & LD_NOCB) {
-        pending_cb_message_t *msg = tor_malloc(sizeof(pending_cb_message_t));
-        msg->severity = severity;
-        msg->domain = domain;
-        msg->msg = tor_strdup(end_of_prefix);
-        smartlist_add(pending_cb_messages, msg);
+        if (!callbacks_deferred) {
+          pending_cb_message_t *msg = tor_malloc(sizeof(pending_cb_message_t));
+          msg->severity = severity;
+          msg->domain = domain;
+          msg->msg = tor_strdup(end_of_prefix);
+          smartlist_add(pending_cb_messages, msg);
+
+          callbacks_deferred = 1;
+        }
       } else {
         lf->callback(severity, domain, end_of_prefix);
       }

From 9ecf133686c8907baec2292ca612ee11aa18406e Mon Sep 17 00:00:00 2001
From: Sebastian Hahn <sebastian@torproject.org>
Date: Sun, 26 Dec 2010 12:13:47 +0100
Subject: [PATCH 07/47] Fix compile wanrings revealed by gcc 4.5 on mingw

---
 changes/bug2314      | 4 ++++
 src/common/crypto.c  | 3 ++-
 src/or/cpuworker.c   | 2 +-
 src/or/eventdns.c    | 8 +++++---
 src/or/ntmain.c      | 6 +++---
 src/test/test_util.c | 1 +
 6 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 changes/bug2314

diff --git a/changes/bug2314 b/changes/bug2314
new file mode 100644
index 000000000..41a232812
--- /dev/null
+++ b/changes/bug2314
@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Fix a bunch of compile warnings revealed by mingw with gcc 4.5. Fixes
+      bug 2314.
+
diff --git a/src/common/crypto.c b/src/common/crypto.c
index e030c5606..52bd365d4 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -1959,14 +1959,15 @@ seed_weak_rng(void)
 int
 crypto_seed_rng(int startup)
 {
-  char buf[ADD_ENTROPY];
   int rand_poll_status = 0;
 
   /* local variables */
 #ifdef MS_WINDOWS
+  unsigned char buf[ADD_ENTROPY];
   static int provider_set = 0;
   static HCRYPTPROV provider;
 #else
+  char buf[ADD_ENTROPY];
   static const char *filenames[] = {
     "/dev/srandom", "/dev/urandom", "/dev/random", NULL
   };
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c
index ae8d69f6e..fecad1489 100644
--- a/src/or/cpuworker.c
+++ b/src/or/cpuworker.c
@@ -250,7 +250,7 @@ cpuworker_main(void *data)
   for (;;) {
     ssize_t r;
 
-    if ((r = recv(fd, &question_type, 1, 0)) != 1) {
+    if ((r = recv(fd, (void *)&question_type, 1, 0)) != 1) {
 //      log_fn(LOG_ERR,"read type failed. Exiting.");
       if (r == 0) {
         log_info(LD_OR,
diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index b929303fd..75a25bd08 100644
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@ -1245,7 +1245,8 @@ nameserver_read(struct nameserver *ns) {
 
 	for (;;) {
 		const int r =
-            (int)recvfrom(ns->socket, packet, (socklen_t)sizeof(packet), 0,
+            (int)recvfrom(ns->socket, (void*)packet,
+						  (socklen_t)sizeof(packet), 0,
 						  sa, &addrlen);
 		if (r < 0) {
 			int err = last_error(ns->socket);
@@ -1276,7 +1277,7 @@ server_port_read(struct evdns_server_port *s) {
 
 	for (;;) {
 		addrlen = (socklen_t)sizeof(struct sockaddr_storage);
-		r = recvfrom(s->socket, packet, sizeof(packet), 0,
+		r = recvfrom(s->socket, (void*)packet, sizeof(packet), 0,
 					 (struct sockaddr*) &addr, &addrlen);
 		if (r < 0) {
 			int err = last_error(s->socket);
@@ -2012,7 +2013,8 @@ evdns_request_timeout_callback(int fd, short events, void *arg) {
 /* 2 other failure */
 static int
 evdns_request_transmit_to(struct evdns_request *req, struct nameserver *server) {
-	const ssize_t r = send(server->socket, req->request, req->request_len, 0);
+	const ssize_t r = send(server->socket, (void*)req->request,
+                         req->request_len, 0);
 	if (r < 0) {
 		int err = last_error(server->socket);
 		if (error_is_eagain(err)) return 1;
diff --git a/src/or/ntmain.c b/src/or/ntmain.c
index 46e7afb78..984acc783 100644
--- a/src/or/ntmain.c
+++ b/src/or/ntmain.c
@@ -518,7 +518,7 @@ nt_service_install(int argc, char **argv)
   SERVICE_DESCRIPTIONA sdBuff;
   char *command;
   char *errmsg;
-  const char *user_acct = GENSRV_USERACCT;
+  const char *user_acct = NULL;
   const char *password = "";
   int i;
   OSVERSIONINFOEX info;
@@ -562,13 +562,12 @@ nt_service_install(int argc, char **argv)
       is_win2k_or_worse = 1;
   }
 
-  if (user_acct == GENSRV_USERACCT) {
+  if (!user_acct) {
     if (is_win2k_or_worse) {
       /* On Win2k, there is no LocalService account, so we actually need to
        * fall back on NULL (the system account). */
       printf("Running on Win2K or earlier, so the LocalService account "
              "doesn't exist.  Falling back to SYSTEM account.\n");
-      user_acct = NULL;
     } else {
       /* Genericity is apparently _so_ last year in Redmond, where some
        * accounts are accounts that you can look up, and some accounts
@@ -577,6 +576,7 @@ nt_service_install(int argc, char **argv)
        */
       printf("Running on a Post-Win2K OS, so we'll assume that the "
              "LocalService account exists.\n");
+      user_acct = GENSRV_USERACCT;
     }
   } else if (0 && service_fns.LookupAccountNameA_fn(NULL, // On this system
                             user_acct,
diff --git a/src/test/test_util.c b/src/test/test_util.c
index a14d548b8..d28fc9caf 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -1200,6 +1200,7 @@ static void
 test_util_load_win_lib(void *ptr)
 {
   HANDLE h = load_windows_system_library("advapi32.dll");
+  (void) ptr;
 
   tt_assert(h);
  done:

From 1a07348a50ec679c8b7bb1abb45e61a9ebcc69a9 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 3 Jan 2011 11:50:39 -0500
Subject: [PATCH 08/47] Bump copyright statements to 2011

---
 LICENSE                  | 2 +-
 Makefile.am              | 2 +-
 contrib/bundle.nsi       | 2 +-
 contrib/netinst.nsi      | 2 +-
 contrib/polipo/README    | 4 ++--
 src/common/address.c     | 2 +-
 src/common/address.h     | 2 +-
 src/common/aes.c         | 2 +-
 src/common/aes.h         | 2 +-
 src/common/compat.c      | 2 +-
 src/common/compat.h      | 2 +-
 src/common/container.c   | 2 +-
 src/common/container.h   | 2 +-
 src/common/crypto.c      | 2 +-
 src/common/crypto.h      | 2 +-
 src/common/ht.h          | 2 +-
 src/common/log.c         | 2 +-
 src/common/log.h         | 2 +-
 src/common/memarea.c     | 2 +-
 src/common/memarea.h     | 2 +-
 src/common/mempool.c     | 2 +-
 src/common/mempool.h     | 2 +-
 src/common/test.h        | 2 +-
 src/common/torgzip.c     | 2 +-
 src/common/torgzip.h     | 2 +-
 src/common/torint.h      | 2 +-
 src/common/tortls.c      | 2 +-
 src/common/tortls.h      | 2 +-
 src/common/util.c        | 2 +-
 src/common/util.h        | 2 +-
 src/or/buffers.c         | 2 +-
 src/or/circuitbuild.c    | 2 +-
 src/or/circuitlist.c     | 2 +-
 src/or/circuituse.c      | 2 +-
 src/or/command.c         | 2 +-
 src/or/config.c          | 4 ++--
 src/or/connection.c      | 2 +-
 src/or/connection_edge.c | 2 +-
 src/or/connection_or.c   | 2 +-
 src/or/control.c         | 2 +-
 src/or/cpuworker.c       | 2 +-
 src/or/directory.c       | 2 +-
 src/or/dirserv.c         | 2 +-
 src/or/dirvote.c         | 2 +-
 src/or/dns.c             | 2 +-
 src/or/dnsserv.c         | 2 +-
 src/or/eventdns_tor.h    | 2 +-
 src/or/geoip.c           | 2 +-
 src/or/hibernate.c       | 2 +-
 src/or/main.c            | 2 +-
 src/or/networkstatus.c   | 2 +-
 src/or/ntmain.c          | 2 +-
 src/or/onion.c           | 2 +-
 src/or/or.h              | 2 +-
 src/or/policies.c        | 2 +-
 src/or/reasons.c         | 2 +-
 src/or/relay.c           | 2 +-
 src/or/rendclient.c      | 2 +-
 src/or/rendcommon.c      | 2 +-
 src/or/rendmid.c         | 2 +-
 src/or/rendservice.c     | 2 +-
 src/or/rephist.c         | 2 +-
 src/or/router.c          | 2 +-
 src/or/routerlist.c      | 2 +-
 src/or/routerparse.c     | 2 +-
 src/or/test.c            | 2 +-
 src/or/test_data.c       | 2 +-
 src/or/tor_main.c        | 2 +-
 src/tools/tor-gencert.c  | 2 +-
 src/tools/tor-resolve.c  | 2 +-
 70 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/LICENSE b/LICENSE
index 9cde591de..19031d2d4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -13,7 +13,7 @@ Tor is distributed under this license:
 
 Copyright (c) 2001-2004, Roger Dingledine
 Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
-Copyright (c) 2007-2010, The Tor Project, Inc.
+Copyright (c) 2007-2011, The Tor Project, Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
diff --git a/Makefile.am b/Makefile.am
index 43ae16136..4ded744fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # $Id$
 # Copyright (c) 2001-2004, Roger Dingledine
 # Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
-# Copyright (c) 2007-2010, The Tor Project, Inc.
+# Copyright (c) 2007-2011, The Tor Project, Inc.
 # See LICENSE for licensing information
 
 AUTOMAKE_OPTIONS = foreign
diff --git a/contrib/bundle.nsi b/contrib/bundle.nsi
index ffc64df3c..55f6b5fa3 100644
--- a/contrib/bundle.nsi
+++ b/contrib/bundle.nsi
@@ -22,7 +22,7 @@ VIProductVersion "${VERSION}"
 VIAddVersionKey "ProductName" "Tor"
 VIAddVersionKey "Comments" "${WEBSITE}"
 VIAddVersionKey "LegalTrademarks" "Three line BSD"
-VIAddVersionKey "LegalCopyright" "©2004-2010, Roger Dingledine, Nick Mathewson, The Tor Project, Inc."
+VIAddVersionKey "LegalCopyright" "©2004-2011, Roger Dingledine, Nick Mathewson, The Tor Project, Inc."
 VIAddVersionKey "FileDescription" "Tor is an implementation of Onion Routing. You can read more at ${WEBSITE}"
 VIAddVersionKey "FileVersion" "${VERSION}"
 
diff --git a/contrib/netinst.nsi b/contrib/netinst.nsi
index 622310e9a..08d950ab0 100644
--- a/contrib/netinst.nsi
+++ b/contrib/netinst.nsi
@@ -22,7 +22,7 @@ VIProductVersion "${VERSION}"
 VIAddVersionKey "ProductName" "Tor"
 VIAddVersionKey "Comments" "${WEBSITE}"
 VIAddVersionKey "LegalTrademarks" "Three line BSD"
-VIAddVersionKey "LegalCopyright" "©2004-2010, Roger Dingledine, Nick Mathewson, The Tor Project, Inc."
+VIAddVersionKey "LegalCopyright" "©2004-2011, Roger Dingledine, Nick Mathewson, The Tor Project, Inc."
 VIAddVersionKey "FileDescription" "Tor is an implementation of Onion Routing. You can read more at ${WEBSITE}"
 VIAddVersionKey "FileVersion" "${VERSION}"
 
diff --git a/contrib/polipo/README b/contrib/polipo/README
index ec7970388..be3d4b63b 100644
--- a/contrib/polipo/README
+++ b/contrib/polipo/README
@@ -1,5 +1,5 @@
-Copyright 2007-2008 Andrew Lewman
-Copyright 2009-2010 The Tor Project
+Copyright 2007-2008, Andrew Lewman
+Copyright 2009-2011, The Tor Project
 
 ----------------
 General Comments
diff --git a/src/common/address.c b/src/common/address.c
index 58ead3075..82a709601 100644
--- a/src/common/address.c
+++ b/src/common/address.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/address.h b/src/common/address.h
index 352e0d723..cb2438791 100644
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/aes.c b/src/common/aes.c
index 5a6bab242..7e332b050 100644
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001, Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/aes.h b/src/common/aes.h
index 4fb735cfe..eb633dbcc 100644
--- a/src/common/aes.h
+++ b/src/common/aes.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /* Implements a minimal interface to counter-mode AES. */
diff --git a/src/common/compat.c b/src/common/compat.c
index 4cc8d9979..333ef5b0f 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/compat.h b/src/common/compat.h
index 209d9fc38..f1d869adf 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #ifndef _TOR_COMPAT_H
diff --git a/src/common/container.c b/src/common/container.c
index 08fab5ced..977d60407 100644
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/container.h b/src/common/container.h
index c42b86977..2b9f964f7 100644
--- a/src/common/container.h
+++ b/src/common/container.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #ifndef _TOR_CONTAINER_H
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 751a5b0c6..334398033 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001, Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/crypto.h b/src/common/crypto.h
index 20fdfa4d2..4fb06be41 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001, Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/ht.h b/src/common/ht.h
index e6dd3d2b2..033cd89ab 100644
--- a/src/common/ht.h
+++ b/src/common/ht.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2002, Christopher Clark.
  * Copyright (c) 2005-2006, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See license at end. */
 
 /* Based on ideas by Christopher Clark and interfaces from Niels Provos. */
diff --git a/src/common/log.c b/src/common/log.c
index da55f4fe0..fe93bd7f5 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001, Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/log.h b/src/common/log.h
index 22b9e2474..2520ed163 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001, Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/memarea.c b/src/common/memarea.c
index edd7bbe9e..ac26c5fd9 100644
--- a/src/common/memarea.c
+++ b/src/common/memarea.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2010, The Tor Project, Inc. */
+/* Copyright (c) 2008-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /** \file memarea.c
diff --git a/src/common/memarea.h b/src/common/memarea.h
index 95d855f6d..4d31dc95a 100644
--- a/src/common/memarea.h
+++ b/src/common/memarea.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008-2010, The Tor Project, Inc. */
+/* Copyright (c) 2008-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* Tor dependencies */
 
diff --git a/src/common/mempool.c b/src/common/mempool.c
index 1f79221b4..9538a0548 100644
--- a/src/common/mempool.c
+++ b/src/common/mempool.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2010, The Tor Project, Inc. */
+/* Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 #if 1
 /* Tor dependencies */
diff --git a/src/common/mempool.h b/src/common/mempool.h
index ae1feea84..fb1e9e8b4 100644
--- a/src/common/mempool.h
+++ b/src/common/mempool.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2010, The Tor Project, Inc. */
+/* Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/test.h b/src/common/test.h
index 1e3db5833..c5995d145 100644
--- a/src/common/test.h
+++ b/src/common/test.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2003, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #ifndef _TOR_TEST_H
diff --git a/src/common/torgzip.c b/src/common/torgzip.c
index 10bce3328..618b8b030 100644
--- a/src/common/torgzip.c
+++ b/src/common/torgzip.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/torgzip.h b/src/common/torgzip.h
index 5139f4bca..15e09eb70 100644
--- a/src/common/torgzip.h
+++ b/src/common/torgzip.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/torint.h b/src/common/torint.h
index 665b0b4c7..4970dcd67 100644
--- a/src/common/torint.h
+++ b/src/common/torint.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 4d11d6d7f..1d597e295 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/tortls.h b/src/common/tortls.h
index e4b1ad65f..9644b87f2 100644
--- a/src/common/tortls.h
+++ b/src/common/tortls.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #ifndef _TOR_TORTLS_H
diff --git a/src/common/util.c b/src/common/util.c
index 0571a532c..2b1430c9f 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/util.h b/src/common/util.h
index fa66d7cf4..fcea9c5b8 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/buffers.c b/src/or/buffers.c
index f26c20219..710374638 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 0ec5aaef5..e86d3d49a 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index b84d7f762..524856875 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -1,7 +1,7 @@
 /* Copyright 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 827c4bbf2..996c99cef 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/command.c b/src/or/command.c
index 011cc5aa3..69205c402 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/config.c b/src/or/config.c
index 0db3b6e5b..45f611457 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
@@ -2294,7 +2294,7 @@ print_usage(void)
   printf(
 "Copyright (c) 2001-2004, Roger Dingledine\n"
 "Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson\n"
-"Copyright (c) 2007-2010, The Tor Project, Inc.\n\n"
+"Copyright (c) 2007-2011, The Tor Project, Inc.\n\n"
 "tor -f <torrc> [args]\n"
 "See man page for options, or https://www.torproject.org/ for "
 "documentation.\n");
diff --git a/src/or/connection.c b/src/or/connection.c
index 5036be450..4869a2439 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 9ecdf5c7a..5e74ad6bc 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index ab0d56196..e70edc7c8 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/control.c b/src/or/control.c
index 7eb2e042f..eae617036 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c
index fde149978..91af5f1d6 100644
--- a/src/or/cpuworker.c
+++ b/src/or/cpuworker.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/directory.c b/src/or/directory.c
index 7ec97d48e..09ebccdc4 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "or.h"
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 851fc5cbd..1649bd740 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #define DIRSERV_PRIVATE
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 64e07cc0a..656cb8a56 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #define DIRVOTE_PRIVATE
diff --git a/src/or/dns.c b/src/or/dns.c
index 98eb27f8b..3bb9c3489 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index bceaa462b..579080be3 100644
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2010, The Tor Project, Inc. */
+/* Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/eventdns_tor.h b/src/or/eventdns_tor.h
index 141ff09f1..6a178938b 100644
--- a/src/or/eventdns_tor.h
+++ b/src/or/eventdns_tor.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2010, The Tor Project, Inc. */
+/* Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
diff --git a/src/or/geoip.c b/src/or/geoip.c
index eb8460e24..360b65f41 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2010, The Tor Project, Inc. */
+/* Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index 5ebe5b1c5..9ec63756f 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/main.c b/src/or/main.c
index af2bf526d..96b7b456e 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 4721420bb..53e8a63ea 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/ntmain.c b/src/or/ntmain.c
index ad6698e72..4dcf9b376 100644
--- a/src/or/ntmain.c
+++ b/src/or/ntmain.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #define MAIN_PRIVATE
diff --git a/src/or/onion.c b/src/or/onion.c
index 42e02c690..9c826a503 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/or.h b/src/or/or.h
index 2a251187f..57e091e9e 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/policies.c b/src/or/policies.c
index 7299b7db3..d4b4a07c5 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/reasons.c b/src/or/reasons.c
index 97fe0f83a..38eb4078c 100644
--- a/src/or/reasons.c
+++ b/src/or/reasons.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/relay.c b/src/or/relay.c
index 02671473e..b40d7ad24 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index feecf237c..edd24d8a3 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 9ee86f667..1d96f3daf 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 23add316a..84b1214dc 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index f5917bc97..9035ea473 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rephist.c b/src/or/rephist.c
index 71ec0bd53..dee74ed5c 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/router.c b/src/or/router.c
index 8661e7a22..75f592d9e 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #define ROUTER_PRIVATE
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 2fc80738f..c6c84a877 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 3d8ca1431..e580df2bc 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/test.c b/src/or/test.c
index 14ba95354..66fa5604b 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /* Ordinarily defined in tor_main.c; this bit is just here to provide one
diff --git a/src/or/test_data.c b/src/or/test_data.c
index f926ee17d..fc8585761 100644
--- a/src/or/test_data.c
+++ b/src/or/test_data.c
@@ -1,6 +1,6 @@
 /* Copyright 2001-2004 Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /** First of 3 example authority certificates for unit testing. */
diff --git a/src/or/tor_main.c b/src/or/tor_main.c
index bb1bf37b4..8fd3804b2 100644
--- a/src/or/tor_main.c
+++ b/src/or/tor_main.c
@@ -1,6 +1,6 @@
 /* Copyright 2001-2004 Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /** String describing which Tor subversion repository version the source was
diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c
index 3f449dc66..e6b09963b 100644
--- a/src/tools/tor-gencert.c
+++ b/src/tools/tor-gencert.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2010 The Tor Project, Inc. */
+/* Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 24c8a6406..4d9d57a31 100644
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
- * Copyright (c) 2007-2010, The Tor Project, Inc.
+ * Copyright (c) 2007-2011, The Tor Project, Inc.
  */
 /* See LICENSE for licensing information */
 

From 30b3475e6d5f5b644d4b607b343ff1da9540d178 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 3 Jan 2011 11:52:09 -0500
Subject: [PATCH 09/47] Bump copyright statements to 2011 (0.2.2)

---
 src/common/compat_libevent.c | 2 +-
 src/common/sha256.c          | 2 +-
 src/common/tortls_states.h   | 2 +-
 src/or/buffers.h             | 2 +-
 src/or/circuitbuild.h        | 2 +-
 src/or/circuitlist.h         | 2 +-
 src/or/circuituse.h          | 2 +-
 src/or/command.h             | 2 +-
 src/or/config.h              | 2 +-
 src/or/connection.h          | 2 +-
 src/or/connection_edge.h     | 2 +-
 src/or/connection_or.h       | 2 +-
 src/or/control.h             | 2 +-
 src/or/cpuworker.h           | 2 +-
 src/or/directory.h           | 2 +-
 src/or/dirserv.h             | 2 +-
 src/or/dirvote.h             | 2 +-
 src/or/dns.h                 | 2 +-
 src/or/dnsserv.h             | 2 +-
 src/or/geoip.h               | 2 +-
 src/or/hibernate.h           | 2 +-
 src/or/main.h                | 2 +-
 src/or/microdesc.c           | 2 +-
 src/or/microdesc.h           | 2 +-
 src/or/networkstatus.h       | 2 +-
 src/or/ntmain.h              | 2 +-
 src/or/onion.h               | 2 +-
 src/or/policies.h            | 2 +-
 src/or/reasons.h             | 2 +-
 src/or/relay.h               | 2 +-
 src/or/rendclient.h          | 2 +-
 src/or/rendcommon.h          | 2 +-
 src/or/rendmid.h             | 2 +-
 src/or/rendservice.h         | 2 +-
 src/or/rephist.h             | 2 +-
 src/or/router.h              | 2 +-
 src/or/routerlist.h          | 2 +-
 src/or/routerparse.h         | 2 +-
 src/test/test.c              | 2 +-
 src/test/test.h              | 2 +-
 src/test/test_addr.c         | 2 +-
 src/test/test_containers.c   | 2 +-
 src/test/test_crypto.c       | 2 +-
 src/test/test_dir.c          | 2 +-
 src/test/test_util.c         | 2 +-
 45 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/common/compat_libevent.c b/src/common/compat_libevent.c
index 96843c73e..b9af61be8 100644
--- a/src/common/compat_libevent.c
+++ b/src/common/compat_libevent.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2010, The Tor Project, Inc. */
+/* Copyright (c) 2009-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/common/sha256.c b/src/common/sha256.c
index 4236d48f5..258b7e062 100644
--- a/src/common/sha256.c
+++ b/src/common/sha256.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2010, The Tor Project, Inc. */
+/* Copyright (c) 2009-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 /* This SHA256 implementation is adapted from the public domain one in
    LibTomCrypt, version 1.6.  Tor uses it on platforms where OpenSSL doesn't
diff --git a/src/common/tortls_states.h b/src/common/tortls_states.h
index 00f476dd6..dcff2479f 100644
--- a/src/common/tortls_states.h
+++ b/src/common/tortls_states.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2003, Roger Dingledine
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /* Helper file: included only in tortls.c */
diff --git a/src/or/buffers.h b/src/or/buffers.h
index 8fd403d95..e50b9ff6f 100644
--- a/src/or/buffers.h
+++ b/src/or/buffers.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h
index a85c41013..74bbd4f22 100644
--- a/src/or/circuitbuild.h
+++ b/src/or/circuitbuild.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h
index caca614c8..ef6fc3a3d 100644
--- a/src/or/circuitlist.h
+++ b/src/or/circuitlist.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/circuituse.h b/src/or/circuituse.h
index 269b6c5f8..1a604b415 100644
--- a/src/or/circuituse.h
+++ b/src/or/circuituse.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/command.h b/src/or/command.h
index 1aa56207f..95b0f3a93 100644
--- a/src/or/command.h
+++ b/src/or/command.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/config.h b/src/or/config.h
index 7a4ba5c60..defda35e0 100644
--- a/src/or/config.h
+++ b/src/or/config.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/connection.h b/src/or/connection.h
index f38927e78..576d3a63e 100644
--- a/src/or/connection.h
+++ b/src/or/connection.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h
index cca82022c..fa5f91cf8 100644
--- a/src/or/connection_edge.h
+++ b/src/or/connection_edge.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/connection_or.h b/src/or/connection_or.h
index 216a9bd64..70ef96a33 100644
--- a/src/or/connection_or.h
+++ b/src/or/connection_or.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/control.h b/src/or/control.h
index 27ef5c37f..2ae96b4b8 100644
--- a/src/or/control.h
+++ b/src/or/control.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/cpuworker.h b/src/or/cpuworker.h
index e09703f21..04e37ee45 100644
--- a/src/or/cpuworker.h
+++ b/src/or/cpuworker.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/directory.h b/src/or/directory.h
index 6fd2c0bef..94dfb1764 100644
--- a/src/or/directory.h
+++ b/src/or/directory.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/dirserv.h b/src/or/dirserv.h
index 94e4e811d..56ad7a6a5 100644
--- a/src/or/dirserv.h
+++ b/src/or/dirserv.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/dirvote.h b/src/or/dirvote.h
index e384dc53b..cd5fe86bc 100644
--- a/src/or/dirvote.h
+++ b/src/or/dirvote.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/dns.h b/src/or/dns.h
index c4fd4d1fb..25ff86e2c 100644
--- a/src/or/dns.h
+++ b/src/or/dns.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/dnsserv.h b/src/or/dnsserv.h
index 5bf154ebb..fcca86888 100644
--- a/src/or/dnsserv.h
+++ b/src/or/dnsserv.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/geoip.h b/src/or/geoip.h
index 68e01deec..bafbeea0f 100644
--- a/src/or/geoip.h
+++ b/src/or/geoip.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/hibernate.h b/src/or/hibernate.h
index 687fadb66..2aea0fab0 100644
--- a/src/or/hibernate.h
+++ b/src/or/hibernate.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/main.h b/src/or/main.h
index ef38dc935..d399aaaaf 100644
--- a/src/or/main.h
+++ b/src/or/main.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/microdesc.c b/src/or/microdesc.c
index e8f3e7c59..2c4b3435f 100644
--- a/src/or/microdesc.c
+++ b/src/or/microdesc.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2010, The Tor Project, Inc. */
+/* Copyright (c) 2009-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "or.h"
diff --git a/src/or/microdesc.h b/src/or/microdesc.h
index 2d1a60ad0..b3e12f8ef 100644
--- a/src/or/microdesc.h
+++ b/src/or/microdesc.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h
index 32b71a9ce..2f18dc952 100644
--- a/src/or/networkstatus.h
+++ b/src/or/networkstatus.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/ntmain.h b/src/or/ntmain.h
index 2cfa653c3..acd0e1d7e 100644
--- a/src/or/ntmain.h
+++ b/src/or/ntmain.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/onion.h b/src/or/onion.h
index e097dcdbb..7f603b814 100644
--- a/src/or/onion.h
+++ b/src/or/onion.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/policies.h b/src/or/policies.h
index dd46f4de9..a954ac4f5 100644
--- a/src/or/policies.h
+++ b/src/or/policies.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/reasons.h b/src/or/reasons.h
index b87d36a77..01f971794 100644
--- a/src/or/reasons.h
+++ b/src/or/reasons.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/relay.h b/src/or/relay.h
index 8ccf0e2b3..dbba09239 100644
--- a/src/or/relay.h
+++ b/src/or/relay.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rendclient.h b/src/or/rendclient.h
index 79d37b2a5..56ccde146 100644
--- a/src/or/rendclient.h
+++ b/src/or/rendclient.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rendcommon.h b/src/or/rendcommon.h
index d3313faf5..501495745 100644
--- a/src/or/rendcommon.h
+++ b/src/or/rendcommon.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rendmid.h b/src/or/rendmid.h
index f06dd3d85..5ed87fd2b 100644
--- a/src/or/rendmid.h
+++ b/src/or/rendmid.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rendservice.h b/src/or/rendservice.h
index 722cec156..70389afe9 100644
--- a/src/or/rendservice.h
+++ b/src/or/rendservice.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/rephist.h b/src/or/rephist.h
index 8f5a34dac..9a3907081 100644
--- a/src/or/rephist.h
+++ b/src/or/rephist.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/router.h b/src/or/router.h
index 0bfa2d554..5e021f6fe 100644
--- a/src/or/router.h
+++ b/src/or/router.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/routerlist.h b/src/or/routerlist.h
index 574bce7ff..ca428114e 100644
--- a/src/or/routerlist.h
+++ b/src/or/routerlist.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/or/routerparse.h b/src/or/routerparse.h
index f41743bcf..bde7800b7 100644
--- a/src/or/routerparse.h
+++ b/src/or/routerparse.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2001 Matej Pfajfar.
  * Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /**
diff --git a/src/test/test.c b/src/test/test.c
index 8782ef507..f5b6a222a 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 /* Ordinarily defined in tor_main.c; this bit is just here to provide one
diff --git a/src/test/test.h b/src/test/test.h
index 550c57a81..f7ae46ce6 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2003, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #ifndef _TOR_TEST_H
diff --git a/src/test/test_addr.c b/src/test/test_addr.c
index bafc0a968..20ffaa0c5 100644
--- a/src/test/test_addr.c
+++ b/src/test/test_addr.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
diff --git a/src/test/test_containers.c b/src/test/test_containers.c
index 1fc248cb4..af9fb1c5c 100644
--- a/src/test/test_containers.c
+++ b/src/test/test_containers.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
index b475914b1..463878618 100644
--- a/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index a0ad1914c..c7c5a0b72 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"
diff --git a/src/test/test_util.c b/src/test/test_util.c
index a14d548b8..0b4beff4b 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -1,6 +1,6 @@
 /* Copyright (c) 2001-2004, Roger Dingledine.
  * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2010, The Tor Project, Inc. */
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
 /* See LICENSE for licensing information */
 
 #include "orconfig.h"

From 989db9aed19f0ca3c93a1638bab4a2b473a94aa9 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 3 Jan 2011 11:57:42 -0500
Subject: [PATCH 10/47] fix whitespace issues

---
 src/or/circuitbuild.c | 5 +++--
 src/or/command.c      | 3 ++-
 src/or/onion.c        | 4 ++--
 src/or/rendmid.c      | 6 ++++--
 src/or/routerparse.c  | 1 -
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index e86d3d49a..065eb052f 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -768,7 +768,8 @@ circuit_extend(cell_t *cell, circuit_t *circ)
   n_addr32 = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE));
   n_port = ntohs(get_uint16(cell->payload+RELAY_HEADER_SIZE+4));
   onionskin = (char*) cell->payload+RELAY_HEADER_SIZE+4+2;
-  id_digest = (char*) cell->payload+RELAY_HEADER_SIZE+4+2+ONIONSKIN_CHALLENGE_LEN;
+  id_digest = (char*) cell->payload+RELAY_HEADER_SIZE+4+2+
+    ONIONSKIN_CHALLENGE_LEN;
   tor_addr_from_ipv4h(&n_addr, n_addr32);
 
   if (!n_port || !n_addr32) {
@@ -923,7 +924,7 @@ circuit_finish_handshake(origin_circuit_t *circ, uint8_t reply_type,
   tor_assert(hop->state == CPATH_STATE_AWAITING_KEYS);
 
   if (reply_type == CELL_CREATED && hop->dh_handshake_state) {
-    if (onion_skin_client_handshake(hop->dh_handshake_state, (char*)reply, keys,
+    if (onion_skin_client_handshake(hop->dh_handshake_state, (char*)reply,keys,
                                     DIGEST_LEN*2+CIPHER_KEY_LEN*2) < 0) {
       log_warn(LD_CIRC,"onion_skin_client_handshake failed.");
       return -END_CIRC_REASON_TORPROTOCOL;
diff --git a/src/or/command.c b/src/or/command.c
index 69205c402..926945680 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -576,7 +576,8 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn)
     /* Consider all the other addresses; if any matches, this connection is
      * "canonical." */
     tor_addr_t addr;
-    const uint8_t *next = decode_address_from_payload(&addr, cp, (int)(end-cp));
+    const uint8_t *next =
+      decode_address_from_payload(&addr, cp, (int)(end-cp));
     if (next == NULL) {
       log_fn(LOG_PROTOCOL_WARN,  LD_OR,
              "Bad address in netinfo cell; closing connection.");
diff --git a/src/or/onion.c b/src/or/onion.c
index 9c826a503..45c75b071 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -379,8 +379,8 @@ fast_server_handshake(const uint8_t *key_in, /* DIGEST_LEN bytes */
  * and protected by TLS).
  */
 int
-fast_client_handshake(const uint8_t *handshake_state, /* DIGEST_LEN bytes */
-                      const uint8_t *handshake_reply_out, /* DIGEST_LEN*2 bytes */
+fast_client_handshake(const uint8_t *handshake_state,/*DIGEST_LEN bytes*/
+                      const uint8_t *handshake_reply_out,/*DIGEST_LEN*2 bytes*/
                       uint8_t *key_out,
                       size_t key_out_len)
 {
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 84b1214dc..064f1be2e 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -64,7 +64,8 @@ rend_mid_establish_intro(or_circuit_t *circ, const uint8_t *request,
   }
   /* Rest of body: signature of previous data */
   note_crypto_pk_op(REND_MID);
-  if (crypto_pk_public_checksig_digest(pk, (char*)request, 2+asn1len+DIGEST_LEN,
+  if (crypto_pk_public_checksig_digest(pk,
+                                       (char*)request, 2+asn1len+DIGEST_LEN,
                                        (char*)(request+2+DIGEST_LEN+asn1len),
                                        request_len-(2+DIGEST_LEN+asn1len))<0) {
     log_warn(LD_PROTOCOL,
@@ -125,7 +126,8 @@ rend_mid_establish_intro(or_circuit_t *circ, const uint8_t *request,
  * INTRODUCE2 cell.
  */
 int
-rend_mid_introduce(or_circuit_t *circ, const uint8_t *request, size_t request_len)
+rend_mid_introduce(or_circuit_t *circ, const uint8_t *request,
+                   size_t request_len)
 {
   or_circuit_t *intro_circ;
   char serviceid[REND_SERVICE_ID_LEN_BASE32+1];
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index e580df2bc..fc30c625b 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -2170,7 +2170,6 @@ networkstatus_v2_parse_from_string(const char *s)
   return ns;
 }
 
-
 /** Parse a v3 networkstatus vote, opinion, or consensus (depending on
  * ns_type), from <b>s</b>, and return the result.  Return NULL on failure. */
 networkstatus_t *

From 40ef9087cf7960ce00cd82aa49309f47c9eb064c Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 3 Jan 2011 11:59:47 -0500
Subject: [PATCH 11/47] Fix a function formatting warning in rephist.c

---
 src/or/rephist.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/or/rephist.c b/src/or/rephist.c
index baedc132a..d85a8b7c3 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -1996,7 +1996,8 @@ rep_hist_exit_stats_term(void)
 
 /** Helper for qsort: compare two ints. */
 static int
-_compare_int(const void *x, const void *y) {
+_compare_int(const void *x, const void *y)
+{
   return (*(int*)x - *(int*)y);
 }
 

From 5c09431cc7c3843a26b2fcc8e52f56f3bba8abb6 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 3 Jan 2011 12:42:19 -0500
Subject: [PATCH 12/47] Never include pthread.h when building for Windows.

On Windows, we never use pthreads, since it doesn't usually exist,
and when it does it tends to be a little weirdly-behaved.  But some
mingw installations have a pthreads installed, so autoconf detects
pthread.h and tells us about it.  This would make us include
pthread.h, which could make for trouble when the iffy pthread.h
tried to include config.h.

This patch changes compat.h so that we never include pthread.h on
Windows.  Fixes bug 2313; bugfix on 0.1.0.1-rc.
---
 changes/bug2313     | 4 ++++
 src/common/compat.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changes/bug2313

diff --git a/changes/bug2313 b/changes/bug2313
new file mode 100644
index 000000000..0ffbe4ab0
--- /dev/null
+++ b/changes/bug2313
@@ -0,0 +1,4 @@
+  o Minor bugfixes
+    - Fix compilation on mingw when a pthreads compatibility library
+      has been installed.  (We don't want to use it, so we shouldn't
+      be including pthread.h.)  Fixes bug 2313; bugfix on 0.1.0.1-rc.
diff --git a/src/common/compat.h b/src/common/compat.h
index f1d869adf..c7ed32b0d 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -31,7 +31,7 @@
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif
-#ifdef HAVE_PTHREAD_H
+#if defined(HAVE_PTHREAD_H) && !defined(MS_WINDOWS)
 #include <pthread.h>
 #endif
 #include <stdarg.h>

From e09ab69703967716b2765e062ca229e641dba53e Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 3 Jan 2011 15:15:27 -0500
Subject: [PATCH 13/47] Check size against SIZE_T_CEILING in realloc too.

Fixes bug 2324.
---
 changes/bug2324   | 4 ++++
 src/common/util.c | 2 ++
 2 files changed, 6 insertions(+)
 create mode 100644 changes/bug2324

diff --git a/changes/bug2324 b/changes/bug2324
new file mode 100644
index 000000000..eefc8370e
--- /dev/null
+++ b/changes/bug2324
@@ -0,0 +1,4 @@
+  o Minor bugfixes
+    - Add a check for SIZE_T_MAX to tor_realloc to try to avoid
+      underflow errors there too.  Fixes bug 2324.
+
diff --git a/src/common/util.c b/src/common/util.c
index 2b1430c9f..7a24df813 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -167,6 +167,8 @@ _tor_realloc(void *ptr, size_t size DMALLOC_PARAMS)
 {
   void *result;
 
+  tor_assert(size < SIZE_T_CEILING);
+
 #ifdef USE_DMALLOC
   result = dmalloc_realloc(file, line, ptr, size, DMALLOC_FUNC_REALLOC, 0);
 #else

From e365aee97110c6c6df6f56ca9814d88c3808a2d1 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 3 Jan 2011 15:30:11 -0500
Subject: [PATCH 14/47] Avoid assertion on read_file_to_str() with
 size==SIZE_T_CEILING-1

Spotted by doors, fixes bug 2326.
---
 changes/bug2326   | 6 ++++++
 src/common/util.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 changes/bug2326

diff --git a/changes/bug2326 b/changes/bug2326
new file mode 100644
index 000000000..239a383fa
--- /dev/null
+++ b/changes/bug2326
@@ -0,0 +1,6 @@
+  o Minor bugfixes
+    - Fix a bug where we would assert if we ever had a
+      cached-descriptors.new file (or another file read directly into
+      memory) of exactly SIZE_T_CEILING bytes.  Found by doors; fixes
+      bug 2326; bugfix on 0.2.1.25.
+
diff --git a/src/common/util.c b/src/common/util.c
index 7a24df813..f206d00c4 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1936,7 +1936,7 @@ read_file_to_str(const char *filename, int flags, struct stat *stat_out)
     return NULL;
   }
 
-  if ((uint64_t)(statbuf.st_size)+1 > SIZE_T_CEILING)
+  if ((uint64_t)(statbuf.st_size)+1 >= SIZE_T_CEILING)
     return NULL;
 
   string = tor_malloc((size_t)(statbuf.st_size+1));

From 64798dab4f4fa9404c92d98cdb10d312b1f6e556 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 3 Jan 2011 15:54:23 -0500
Subject: [PATCH 15/47] Detect and disallow compression bombs

---
 changes/bug2324_uncompress |  5 ++++
 src/common/torgzip.c       | 51 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 changes/bug2324_uncompress

diff --git a/changes/bug2324_uncompress b/changes/bug2324_uncompress
new file mode 100644
index 000000000..223a3ce35
--- /dev/null
+++ b/changes/bug2324_uncompress
@@ -0,0 +1,5 @@
+  o Major bugfixes (security):
+    - Prevent a DoS attack by disallowing any zlib-compressed data
+      whose compression factor is implausibly high.  Fixes the
+      second part of bug2324; found by doors.
+
diff --git a/src/common/torgzip.c b/src/common/torgzip.c
index 618b8b030..b44b159a4 100644
--- a/src/common/torgzip.c
+++ b/src/common/torgzip.c
@@ -57,6 +57,24 @@ method_bits(compress_method_t method)
   return method == GZIP_METHOD ? 15+16 : 15;
 }
 
+/* These macros define the maximum allowable compression factor.  Anything of
+ * size greater than <b>check_for_compression_bomb_after</b> is not allowed to
+ * have an uncompression factor (uncompressed size:compressed size ratio) of
+ * any greater than MAX_UNCOMPRESSION_FACTOR. */
+#define MAX_UNCOMPRESSION_FACTOR 25
+#define CHECK_FOR_COMPRESSION_BOMB_AFTER (1024*64)
+
+/** Return true if uncompressing an input of size <b>in_size</b> to an input
+ * of size at least <b>size_out</b> looks like a compression bomb. */
+static int
+is_compression_bomb(size_t size_in, size_t size_out)
+{
+  if (size_in == 0 || size_out < CHECK_FOR_COMPRESSION_BOMB_AFTER)
+    return 0;
+
+  return (size_out / size_in > MAX_UNCOMPRESSION_FACTOR);
+}
+
 /** Given <b>in_len</b> bytes at <b>in</b>, compress them into a newly
  * allocated buffer, using the method described in <b>method</b>.  Store the
  * compressed string in *<b>out</b>, and its length in *<b>out_len</b>.
@@ -159,6 +177,12 @@ tor_gzip_compress(char **out, size_t *out_len,
   }
   tor_free(stream);
 
+  if (is_compression_bomb(*out_len, in_len)) {
+    log_warn(LD_BUG, "We compressed something and got an insanely high "
+          "compression factor; other Tors would think this was a zlib bomb.");
+    goto err;
+  }
+
   return 0;
  err:
   if (stream) {
@@ -223,7 +247,7 @@ tor_gzip_uncompress(char **out, size_t *out_len,
 
   out_size = in_len * 2;  /* guess 50% compression. */
   if (out_size < 1024) out_size = 1024;
-  if (out_size > UINT_MAX)
+  if (out_size > SIZE_T_CEILING || out_size > UINT_MAX)
     goto err;
 
   *out = tor_malloc(out_size);
@@ -263,7 +287,16 @@ tor_gzip_uncompress(char **out, size_t *out_len,
         old_size = out_size;
         out_size *= 2;
         if (out_size < old_size) {
-          log_warn(LD_GENERAL, "Size overflow in compression.");
+          log_warn(LD_GENERAL, "Size overflow in uncompression.");
+          goto err;
+        }
+        if (is_compression_bomb(in_len, out_size)) {
+          log_warn(LD_GENERAL, "Input looks look a possible zlib bomb; "
+                   "not proceeding.");
+          goto err;
+        }
+        if (out_size >= SIZE_T_CEILING) {
+          log_warn(LD_BUG, "Hit SIZE_T_CEILING limit while uncompressing.");
           goto err;
         }
         *out = tor_realloc(*out, out_size);
@@ -329,6 +362,11 @@ detect_compression_method(const char *in, size_t in_len)
 struct tor_zlib_state_t {
   struct z_stream_s stream;
   int compress;
+
+  /* Number of bytes read so far.  Used to detect zlib bombs. */
+  size_t input_so_far;
+  /* Number of bytes written so far.  Used to detect zlib bombs. */
+  size_t output_so_far;
 };
 
 /** Construct and return a tor_zlib_state_t object using <b>method</b>.  If
@@ -395,11 +433,20 @@ tor_zlib_process(tor_zlib_state_t *state,
     err = inflate(&state->stream, finish ? Z_FINISH : Z_SYNC_FLUSH);
   }
 
+  state->input_so_far += state->stream.next_in - ((unsigned char*)*in);
+  state->output_so_far += state->stream.next_out - ((unsigned char*)*out);
+
   *out = (char*) state->stream.next_out;
   *out_len = state->stream.avail_out;
   *in = (const char *) state->stream.next_in;
   *in_len = state->stream.avail_in;
 
+  if (! state->compress &&
+      is_compression_bomb(state->input_so_far, state->output_so_far)) {
+    log_warn(LD_DIR, "Possible zlib bomb; abandoning stream.");
+    return TOR_ZLIB_ERR;
+  }
+
   switch (err)
     {
     case Z_STREAM_END:

From 0222228d64bf29a3b9db5a80a557e20c3c360224 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 3 Jan 2011 16:16:53 -0500
Subject: [PATCH 16/47] Fix up size and sign issues in base32 code

Fixes bug 2331.
---
 changes/bug2331     |  6 ++++++
 src/common/crypto.c | 10 ++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 changes/bug2331

diff --git a/changes/bug2331 b/changes/bug2331
new file mode 100644
index 000000000..df97ac2b4
--- /dev/null
+++ b/changes/bug2331
@@ -0,0 +1,6 @@
+  o Minor bugfixes:
+    - Add assertions to check for overflow in arguments to
+      base32_encode and base32_decode; fix a signed-unsigned
+      comparison there too.  These bugs are actually reachable in Tor,
+      but it's good to prevent future errors too.  Found by doorss.
+
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 65162618a..71cf6d43d 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -2412,9 +2412,10 @@ digest256_from_base64(char *digest, const char *d64)
 void
 base32_encode(char *dest, size_t destlen, const char *src, size_t srclen)
 {
-  unsigned int i, bit, v, u;
-  size_t nbits = srclen * 8;
+  unsigned int i, v, u;
+  size_t nbits = srclen * 8, bit;
 
+  tor_assert(srclen < SIZE_T_CEILING/8);
   tor_assert((nbits%5) == 0); /* We need an even multiple of 5 bits. */
   tor_assert((nbits/5)+1 <= destlen); /* We need enough space. */
   tor_assert(destlen < SIZE_T_CEILING);
@@ -2438,11 +2439,12 @@ base32_decode(char *dest, size_t destlen, const char *src, size_t srclen)
 {
   /* XXXX we might want to rewrite this along the lines of base64_decode, if
    * it ever shows up in the profile. */
-  unsigned int i, j, bit;
-  size_t nbits;
+  unsigned int i, bit;
+  size_t nbits, j;
   char *tmp;
   nbits = srclen * 5;
 
+  tor_assert(srclen < SIZE_T_CEILING / 5);
   tor_assert((nbits%8) == 0); /* We need an even multiple of 8 bits. */
   tor_assert((nbits/8) <= destlen); /* We need enough space. */
   tor_assert(destlen < SIZE_T_CEILING);

From 81d69f4c2d8a4517d1600c617924dec84228c889 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 3 Jan 2011 16:54:57 -0500
Subject: [PATCH 17/47] Detect signed size_t and report an error at configure
 time.

---
 changes/bug2337 |  3 +++
 configure.in    | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 changes/bug2337

diff --git a/changes/bug2337 b/changes/bug2337
new file mode 100644
index 000000000..a4f052dc3
--- /dev/null
+++ b/changes/bug2337
@@ -0,0 +1,3 @@
+  o Minor bugfixes
+    - Detect broken platforms with a signed size_t, and refuse to
+      build there.  Found and analyzed by doorss and rransom.
diff --git a/configure.in b/configure.in
index 68c593a11..394be9e82 100644
--- a/configure.in
+++ b/configure.in
@@ -548,6 +548,23 @@ if test "$tor_cv_time_t_signed" != no; then
             [Define to 1 iff time_t is signed])
 fi
 
+AC_CACHE_CHECK([whether size_t is signed], tor_cv_size_t_signed, [
+AC_RUN_IFELSE(AC_LANG_SOURCE([
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+int main(int c, char**v) { if (((size_t)-1)<0) return 1; else return 0; }]),
+  tor_cv_size_t_signed=no, tor_cv_size_t_signed=yes, tor_cv_size_t_signed=cross)
+])
+
+if test "$tor_cv_size_t_signed" = cross; then
+  AC_MSG_NOTICE([Cross compiling: assuming that size_t is not signed.])
+fi
+
+if test "$tor_cv_size_t_signed" = yes; then
+  AC_MSG_ERROR([You have a signed size_t; that's grossly nonconformant.])
+fi
+
 AC_CHECK_SIZEOF(socklen_t, , [AC_INCLUDES_DEFAULT()
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>

From e4320689cc468be246264b3fba64e6fa95a74c19 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 3 Jan 2011 17:19:05 -0500
Subject: [PATCH 18/47] Note that Tor requires Automake 1.7. Fixes bug 2305

---
 Makefile.am     | 2 +-
 changes/bug2305 | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changes/bug2305

diff --git a/Makefile.am b/Makefile.am
index 4ded744fd..bcb81e64f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@
 # Copyright (c) 2007-2011, The Tor Project, Inc.
 # See LICENSE for licensing information
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign 1.7
  # else it keeps trying to put COPYING back in
 
 SUBDIRS = src doc contrib
diff --git a/changes/bug2305 b/changes/bug2305
new file mode 100644
index 000000000..c979d5fd3
--- /dev/null
+++ b/changes/bug2305
@@ -0,0 +1,5 @@
+  o Build changes
+    - Tor does not build packages correctly with Automake 1.6 and earlier;
+      added a check to Makefile.am to make sure that we're building with
+      Automake 1.7 or later.
+

From d14b0d54d2469744266769d7e61135d1aa1c9c11 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 5 Jan 2011 12:42:34 -0500
Subject: [PATCH 19/47] Fix a SIZE_T_CEILING check in torgzip.c; noticed by
 cypherpunks

---
 src/common/torgzip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/torgzip.c b/src/common/torgzip.c
index b44b159a4..767866877 100644
--- a/src/common/torgzip.c
+++ b/src/common/torgzip.c
@@ -247,7 +247,7 @@ tor_gzip_uncompress(char **out, size_t *out_len,
 
   out_size = in_len * 2;  /* guess 50% compression. */
   if (out_size < 1024) out_size = 1024;
-  if (out_size > SIZE_T_CEILING || out_size > UINT_MAX)
+  if (out_size >= SIZE_T_CEILING || out_size > UINT_MAX)
     goto err;
 
   *out = tor_malloc(out_size);

From 240fa42aacf8cadbd00b66686320365359d8179a Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 5 Jan 2011 12:49:02 -0500
Subject: [PATCH 20/47] Fix size_t vs unsigned comparison too

---
 src/common/crypto.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 71cf6d43d..e47fa5602 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -2439,8 +2439,8 @@ base32_decode(char *dest, size_t destlen, const char *src, size_t srclen)
 {
   /* XXXX we might want to rewrite this along the lines of base64_decode, if
    * it ever shows up in the profile. */
-  unsigned int i, bit;
-  size_t nbits, j;
+  unsigned int i;
+  size_t nbits, j, bit;
   char *tmp;
   nbits = srclen * 5;
 

From 31d6659d974800e972af43856405e8a7abe08f72 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 5 Jan 2011 16:02:43 -0500
Subject: [PATCH 21/47] Fix a double-counting bug in
 addrmap_get_virtual_address

We were decrementing "available" twice for each in-use address we ran
across.  This would make us declare that we ran out of virtual
addresses when the address space was only half full.
---
 changes/bug2328          | 4 ++++
 src/or/connection_edge.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changes/bug2328

diff --git a/changes/bug2328 b/changes/bug2328
new file mode 100644
index 000000000..e5ce492a8
--- /dev/null
+++ b/changes/bug2328
@@ -0,0 +1,4 @@
+  o Minor bugfixes
+    - Fix a bug where we would declare that we had run out of virtual
+      addresses when the address space was only half-exhausted.  Bugfix
+      on 0.1.1.19-rc.
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 9ecdf5c7a..6c2377531 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1178,7 +1178,7 @@ addressmap_get_virtual_address(int type)
       ++next_virtual_addr;
       --available;
       log_info(LD_CONFIG, "%d addrs available", (int)available);
-      if (! --available) {
+      if (! available) {
         log_warn(LD_CONFIG, "Ran out of virtual addresses!");
         return NULL;
       }

From eabddd8ca003af2788832208e9ab666f7d3e9378 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 5 Jan 2011 16:36:48 -0500
Subject: [PATCH 22/47] Handle a NULL return from
 addressmap_get_virtual_address

Fix for bug 2328; bugfix on 0.1.2.1-alpha; bug found by doorss.
---
 changes/bug2328          |  6 +++++-
 src/or/connection_edge.c | 24 ++++++++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/changes/bug2328 b/changes/bug2328
index e5ce492a8..f1a4fa89c 100644
--- a/changes/bug2328
+++ b/changes/bug2328
@@ -1,4 +1,8 @@
   o Minor bugfixes
     - Fix a bug where we would declare that we had run out of virtual
       addresses when the address space was only half-exhausted.  Bugfix
-      on 0.1.1.19-rc.
+      on 0.1.2.1-alpha.
+    - Correctly handle the case where AutomapHostsOnResolve is set but no
+      virtual addresses are available.  Fixes bug2328, bugfix on
+      0.1.2.1-alpha.  Bug found by doorss.
+
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 6c2377531..a01a6e38a 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1142,6 +1142,8 @@ address_is_in_virtual_range(const char *address)
 /** Return a newly allocated string holding an address of <b>type</b>
  * (one of RESOLVED_TYPE_{IPV4|HOSTNAME}) that has not yet been mapped,
  * and that is very unlikely to be the address of any real host.
+ *
+ * May return NULL if we have run out of virtual addresses.
  */
 static char *
 addressmap_get_virtual_address(int type)
@@ -1199,14 +1201,15 @@ addressmap_get_virtual_address(int type)
  * allocated string.  If another address of the same type is already
  * mapped to <b>new_address</b>, try to return a copy of that address.
  *
- * The string in <b>new_address</b> may be freed, or inserted into a map
- * as appropriate.
+ * The string in <b>new_address</b> may be freed or inserted into a map
+ * as appropriate.  May return NULL if are out of virtual addresses.
  **/
 const char *
 addressmap_register_virtual_address(int type, char *new_address)
 {
   char **addrp;
   virtaddress_entry_t *vent;
+  int vent_needs_to_be_added = 0;
 
   tor_assert(new_address);
   tor_assert(addressmap);
@@ -1215,7 +1218,7 @@ addressmap_register_virtual_address(int type, char *new_address)
   vent = strmap_get(virtaddress_reversemap, new_address);
   if (!vent) {
     vent = tor_malloc_zero(sizeof(virtaddress_entry_t));
-    strmap_set(virtaddress_reversemap, new_address, vent);
+    vent_needs_to_be_added = 1;
   }
 
   addrp = (type == RESOLVED_TYPE_IPV4) ?
@@ -1225,6 +1228,7 @@ addressmap_register_virtual_address(int type, char *new_address)
     if (ent && ent->new_address &&
         !strcasecmp(new_address, ent->new_address)) {
       tor_free(new_address);
+      tor_assert(!vent_needs_to_be_added);
       return tor_strdup(*addrp);
     } else
       log_warn(LD_BUG,
@@ -1236,7 +1240,14 @@ addressmap_register_virtual_address(int type, char *new_address)
 
   tor_free(*addrp);
   *addrp = addressmap_get_virtual_address(type);
+  if (!*addrp) {
+    tor_free(vent);
+    tor_free(new_address);
+    return NULL;
+  }
   log_info(LD_APP, "Registering map from %s to %s", *addrp, new_address);
+  if (vent_needs_to_be_added)
+    strmap_set(virtaddress_reversemap, new_address, vent);
   addressmap_register(*addrp, new_address, 2, ADDRMAPSRC_CONTROLLER);
 
 #if 0
@@ -1415,7 +1426,12 @@ connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn,
       const char *new_addr;
       new_addr = addressmap_register_virtual_address(
                               RESOLVED_TYPE_IPV4, tor_strdup(socks->address));
-      tor_assert(new_addr);
+      if (! new_addr) {
+        log_warn(LD_APP, "Unable to automap address %s",
+                 escaped_safe_str(socks->address));
+        connection_mark_unattached_ap(conn, END_STREAM_REASON_INTERNAL);
+        return -1;
+      }
       log_info(LD_APP, "Automapping %s to %s",
                escaped_safe_str(socks->address), safe_str(new_addr));
       strlcpy(socks->address, new_addr, sizeof(socks->address));

From 2008728df70969d1868b204d4d1059541229d66f Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 6 Jan 2011 13:29:36 -0500
Subject: [PATCH 23/47] Notice a little faster if we're running out of virtual
 addresses

We were not decrementing "available" every time we did
++next_virtual_addr in addressmap_get_virtual_address: we left out the
--available when we skipped .00 and .255 addresses.

This didn't actually cause a bug in most cases, since the failure mode
was to keep looping around the virtual addresses until we found one,
or until available hit zero.  It could have given you an infinite loop
rather than a useful message, however, if you said "VirtualAddrNetwork
127.0.0.255/32" or something broken like that.

Spotted by cypherpunks
---
 src/or/connection_edge.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index a01a6e38a..001408a79 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1169,6 +1169,10 @@ addressmap_get_virtual_address(int type)
       while ((next_virtual_addr & 0xff) == 0 ||
              (next_virtual_addr & 0xff) == 0xff) {
         ++next_virtual_addr;
+        if (! --available) {
+          log_warn(LD_CONFIG, "Ran out of virtual addresses!");
+          return NULL;
+        }
       }
       in.s_addr = htonl(next_virtual_addr);
       tor_inet_ntoa(&in, buf, sizeof(buf));

From 0a35ac6a22de04748c2f078c8f1f5a166423049d Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Jan 2011 12:18:37 -0500
Subject: [PATCH 24/47] Correctly detect and exclude addresses outside of our
 virtual address range

Found by cypherpunks; fixes more of 2328.  Bug was introduced in 3623a122;
first appeared in 0.2.0.5-alpha.
---
 changes/bug2328          |  3 ++-
 src/or/connection_edge.c | 21 +++++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/changes/bug2328 b/changes/bug2328
index f1a4fa89c..fee80a158 100644
--- a/changes/bug2328
+++ b/changes/bug2328
@@ -5,4 +5,5 @@
     - Correctly handle the case where AutomapHostsOnResolve is set but no
       virtual addresses are available.  Fixes bug2328, bugfix on
       0.1.2.1-alpha.  Bug found by doorss.
-
+    - Correctly handle wrapping around to when we run out of virtual address
+      space.  Found by cypherpunks, bugfix on 0.2.0.5-alpha.
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 4caa01cb5..05338e83b 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1139,6 +1139,18 @@ address_is_in_virtual_range(const char *address)
   return 0;
 }
 
+/** Increment the value of next_virtual_addr; reset it to the start of the
+ * virtual address range if it wraps around.
+ */
+static INLINE void
+increment_virtual_addr(void)
+{
+  ++next_virtual_addr;
+  if (addr_mask_cmp_bits(next_virtual_addr, virtual_addr_network,
+                         virtual_addr_netmask_bits))
+    next_virtual_addr = virtual_addr_network;
+}
+
 /** Return a newly allocated string holding an address of <b>type</b>
  * (one of RESOLVED_TYPE_{IPV4|HOSTNAME}) that has not yet been mapped,
  * and that is very unlikely to be the address of any real host.
@@ -1168,7 +1180,7 @@ addressmap_get_virtual_address(int type)
       /* Don't hand out any .0 or .255 address. */
       while ((next_virtual_addr & 0xff) == 0 ||
              (next_virtual_addr & 0xff) == 0xff) {
-        ++next_virtual_addr;
+        increment_virtual_addr();
         if (! --available) {
           log_warn(LD_CONFIG, "Ran out of virtual addresses!");
           return NULL;
@@ -1177,20 +1189,17 @@ addressmap_get_virtual_address(int type)
       in.s_addr = htonl(next_virtual_addr);
       tor_inet_ntoa(&in, buf, sizeof(buf));
       if (!strmap_get(addressmap, buf)) {
-        ++next_virtual_addr;
+        increment_virtual_addr();
         break;
       }
 
-      ++next_virtual_addr;
+      increment_virtual_addr();
       --available;
       log_info(LD_CONFIG, "%d addrs available", (int)available);
       if (! available) {
         log_warn(LD_CONFIG, "Ran out of virtual addresses!");
         return NULL;
       }
-      if (addr_mask_cmp_bits(next_virtual_addr, virtual_addr_network,
-                             virtual_addr_netmask_bits))
-        next_virtual_addr = virtual_addr_network;
     }
     return tor_strdup(buf);
   } else {

From 045e6ebd315db635ea80796469891bab33d1d6be Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Jan 2011 22:03:22 -0500
Subject: [PATCH 25/47] Remove a loud info log message

---
 src/or/connection_edge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 05338e83b..052aa3706 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1195,7 +1195,7 @@ addressmap_get_virtual_address(int type)
 
       increment_virtual_addr();
       --available;
-      log_info(LD_CONFIG, "%d addrs available", (int)available);
+      // log_info(LD_CONFIG, "%d addrs available", (int)available);
       if (! available) {
         log_warn(LD_CONFIG, "Ran out of virtual addresses!");
         return NULL;

From 732275bb81992c33d6b707b64e621f161b97622a Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 9 Jan 2011 15:40:40 -0500
Subject: [PATCH 26/47] Describe tor-resolve defaults. Bug 2364.

---
 changes/bug2364       | 4 ++++
 doc/tor-resolve.1.txt | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 changes/bug2364

diff --git a/changes/bug2364 b/changes/bug2364
new file mode 100644
index 000000000..37de6ef52
--- /dev/null
+++ b/changes/bug2364
@@ -0,0 +1,4 @@
+  o Documentation
+    - Document the default socks host and port (127.0.0.1:9050) for
+      tor-resolve.
+
diff --git a/doc/tor-resolve.1.txt b/doc/tor-resolve.1.txt
index eb519667b..bdc636b08 100644
--- a/doc/tor-resolve.1.txt
+++ b/doc/tor-resolve.1.txt
@@ -19,6 +19,10 @@ DESCRIPTION
 **tor-resolve** is a simple script to connect to a SOCKS proxy that knows about
 the SOCKS RESOLVE command, hand it a hostname, and return an IP address.
 
+By default, **tor-resolve** uses the Tor server running on 127.0.0.1 on SOCKS
+port 9050.  If this isn't what you want, you should specify an explicit
+__sockshost__ and/or __socksport__ on the command line.
+
 OPTIONS
 -------
 **-v**::
@@ -42,4 +46,4 @@ See doc/socks-extensions.txt in the Tor package for protocol details.
 
 AUTHORS
 -------
-Roger Dingledine <arma@mit.edu>, Nick Mathewson <nickm@alum.mit.edu>.
\ No newline at end of file
+Roger Dingledine <arma@mit.edu>, Nick Mathewson <nickm@alum.mit.edu>.

From 68d5b6bc5213b7eb411810361e04fe371ef19048 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 9 Jan 2011 18:54:45 -0500
Subject: [PATCH 27/47] Fix check for failed evdns request creation

When using libevent 2, we use evdns_base_resolve_*().  When not, we
fake evdns_base_resolve_*() using evdns_resolve_*().

Our old check was looking for negative values (like libevent 2
returns), but our eventdns.c code returns 1.  This code makes the
check just test for nonzero.

Note that this broken check was not for _resolve_ failures or even for
failures to _launch_ a resolve: it was for failures to _create_ or
_encode_ a resolve request.

Bug introduced in 81eee0ecfff3dac1e9438719d2f7dc0ba7e84a71; found by
lodger; uploaded to trac by rransom.  Bug 2363.  Fix on 0.2.2.6-alpha.
---
 changes/bug2363 |  6 ++++++
 src/or/dns.c    | 10 +++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 changes/bug2363

diff --git a/changes/bug2363 b/changes/bug2363
new file mode 100644
index 000000000..179925f65
--- /dev/null
+++ b/changes/bug2363
@@ -0,0 +1,6 @@
+  o Minor bugfixes
+    - Correctly detect failures to create DNS requests when using Libevent
+      versions before v2.  (Before Libevent 2, we used our own evdns
+      implementation.  Its return values for Libevent's evdns_resolve_*()
+      functions are not consistent with those from Libevent.) Found by
+      Lodger; fixes bug 2363; bugfix on 0.2.2.6-alpha.
diff --git a/src/or/dns.c b/src/or/dns.c
index 5c763011b..639317112 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -54,12 +54,16 @@ struct evdns_request;
   evdns_config_windows_nameservers()
 #define evdns_base_set_option_(base, opt, val) \
   evdns_set_option((opt),(val),DNS_OPTIONS_ALL)
+/* Note: our internal eventdns.c, plus libevent 1.4, used a 1 return to
+ * signify failure to launch a resolve. Libevent 2.0 uses a -1 return to
+ * signify a failure on a resolve, though if we're on libevent 2.0, we should
+ * have event2/dns.h and never hit these macros.  Regardless, 0 is success. */
 #define evdns_base_resolve_ipv4(base, addr, options, cb, ptr) \
-  ((evdns_resolve_ipv4(addr, options, cb, ptr)<0) ? NULL : ((void*)1))
+  ((evdns_resolve_ipv4(addr, options, cb, ptr)!=0) ? NULL : ((void*)1))
 #define evdns_base_resolve_reverse(base, addr, options, cb, ptr) \
-  ((evdns_resolve_reverse(addr, options, cb, ptr)<0) ? NULL : ((void*)1))
+  ((evdns_resolve_reverse(addr, options, cb, ptr)!=0) ? NULL : ((void*)1))
 #define evdns_base_resolve_reverse_ipv6(base, addr, options, cb, ptr) \
-  ((evdns_resolve_reverse_ipv6(addr, options, cb, ptr)<0) ? NULL : ((void*)1))
+  ((evdns_resolve_reverse_ipv6(addr, options, cb, ptr)!=0) ? NULL : ((void*)1))
 
 #elif defined(LIBEVENT_VERSION_NUMBER) && LIBEVENT_VERSION_NUMBER < 0x02000303
 #define evdns_base_set_option_(base, opt, val) \

From efc9a84108903edf1d68b9f0c511538f15fc7f52 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 9 Jan 2011 19:05:06 -0500
Subject: [PATCH 28/47] Add missing parens to evdns_base_resolve_* macros while
 I am at it

---
 src/or/dns.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/or/dns.c b/src/or/dns.c
index 639317112..dcccd1390 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -54,16 +54,19 @@ struct evdns_request;
   evdns_config_windows_nameservers()
 #define evdns_base_set_option_(base, opt, val) \
   evdns_set_option((opt),(val),DNS_OPTIONS_ALL)
-/* Note: our internal eventdns.c, plus libevent 1.4, used a 1 return to
+/* Note: our internal eventdns.c, plus Libevent 1.4, used a 1 return to
  * signify failure to launch a resolve. Libevent 2.0 uses a -1 return to
- * signify a failure on a resolve, though if we're on libevent 2.0, we should
+ * signify a failure on a resolve, though if we're on Libevent 2.0, we should
  * have event2/dns.h and never hit these macros.  Regardless, 0 is success. */
 #define evdns_base_resolve_ipv4(base, addr, options, cb, ptr) \
-  ((evdns_resolve_ipv4(addr, options, cb, ptr)!=0) ? NULL : ((void*)1))
-#define evdns_base_resolve_reverse(base, addr, options, cb, ptr) \
-  ((evdns_resolve_reverse(addr, options, cb, ptr)!=0) ? NULL : ((void*)1))
-#define evdns_base_resolve_reverse_ipv6(base, addr, options, cb, ptr) \
-  ((evdns_resolve_reverse_ipv6(addr, options, cb, ptr)!=0) ? NULL : ((void*)1))
+  ((evdns_resolve_ipv4((addr), (options), (cb), (ptr))!=0)    \
+   ? NULL : ((void*)1))
+#define evdns_base_resolve_reverse(base, addr, options, cb, ptr)        \
+  ((evdns_resolve_reverse((addr), (options), (cb), (ptr))!=0)           \
+   ? NULL : ((void*)1))
+#define evdns_base_resolve_reverse_ipv6(base, addr, options, cb, ptr)   \
+  ((evdns_resolve_reverse_ipv6((addr), (options), (cb), (ptr))!=0)      \
+   ? NULL : ((void*)1))
 
 #elif defined(LIBEVENT_VERSION_NUMBER) && LIBEVENT_VERSION_NUMBER < 0x02000303
 #define evdns_base_set_option_(base, opt, val) \

From d43cba6c690d9c227b13cd7426285b82b9523611 Mon Sep 17 00:00:00 2001
From: Karsten Loesing <karsten.loesing@gmx.net>
Date: Mon, 10 Jan 2011 10:37:54 +0100
Subject: [PATCH 29/47] Update to the January 1 2011 Maxmind GeoLite Country
 database.

---
 changes/geoip-jan2011 |    3 +
 src/config/geoip      | 5317 +++++++++++++++++++++++++++--------------
 2 files changed, 3515 insertions(+), 1805 deletions(-)
 create mode 100644 changes/geoip-jan2011

diff --git a/changes/geoip-jan2011 b/changes/geoip-jan2011
new file mode 100644
index 000000000..b58805ad3
--- /dev/null
+++ b/changes/geoip-jan2011
@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update to the January 1 2011 Maxmind GeoLite Country database.
+
diff --git a/src/config/geoip b/src/config/geoip
index e28e7b0a5..78471a992 100644
--- a/src/config/geoip
+++ b/src/config/geoip
@@ -1,4 +1,4 @@
-# Last updated based on December 1 2010 Maxmind GeoLite Country
+# Last updated based on January 1 2011 Maxmind GeoLite Country
 # wget http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip
 # cut -d, -f3-5 < GeoIPCountryWhois.csv|sed 's/"//g' > geoip
 16777216,17301503,AU
@@ -40,7 +40,14 @@
 30015488,30408703,CN
 30408704,33554431,KR
 33554432,34603007,FR
-34603008,35127295,EU
+34603008,34620415,EU
+34620416,34620927,SE
+34620928,34621439,IT
+34621440,34803711,EU
+34803712,34807807,IT
+34807808,34866175,EU
+34866176,34867199,IT
+34867200,35127295,EU
 35127296,35651583,GB
 35651584,36700159,IT
 36700160,36962303,AE
@@ -63,6 +70,8 @@
 40370176,40894463,DK
 40894464,41418751,IT
 41418752,41943039,GB
+41943040,42205183,DK
+42205184,42467327,KZ
 42467328,42991615,ES
 42991616,43253759,IR
 43253760,43515903,NO
@@ -72,6 +81,10 @@
 45088768,46137343,IR
 46137344,46661631,IT
 46661632,47710207,DE
+47710208,48234495,GB
+48234496,49283071,IT
+49283072,49807359,DE
+49807360,50331647,SE
 50331648,68257567,US
 68257568,68257599,CA
 68257600,68259583,US
@@ -614,7 +627,7 @@
 241623040,241627135,IN
 241627136,241631231,HK
 241631232,243269631,CN
-243269632,243269887,AP
+243269632,243270655,JP
 243270656,243271679,NZ
 243271680,243272703,TH
 243272704,243273727,NP
@@ -661,8 +674,7 @@
 355993888,355993895,IT
 355993896,368674047,US
 368674048,368674303,ES
-368674304,385875967,US
-402653184,405012479,US
+368674304,405012479,US
 405012480,405143551,CA
 405143552,405180415,US
 405180416,405184511,CA
@@ -710,12 +722,18 @@
 410177752,410177755,US
 410177756,410180643,CA
 410180644,410180647,US
-410180648,410185355,CA
+410180648,410180711,CA
+410180712,410180715,US
+410180716,410180771,CA
+410180772,410180775,US
+410180776,410185355,CA
 410185356,410185359,US
 410185360,410185407,CA
 410185408,410185411,US
-410185412,410185555,CA
-410185556,410185559,US
+410185412,410185539,CA
+410185540,410185543,US
+410185544,410185551,CA
+410185552,410185559,US
 410185560,410186719,CA
 410186720,410186723,US
 410186724,410186971,CA
@@ -1210,6 +1228,7 @@
 691994624,692011007,ZM
 692011008,692027391,ZA
 692027392,692035583,MG
+692035584,692043775,AO
 692043776,692060159,NA
 692060160,692191231,EG
 692191232,692207615,CI
@@ -1258,6 +1277,8 @@
 692793344,692797439,GH
 692797440,692801535,CG
 692801536,692805631,NG
+692805632,692809727,ZA
+692826112,692830207,KE
 692830208,692834303,NG
 692834304,692838399,TZ
 692838400,692842495,ZA
@@ -1286,6 +1307,9 @@
 692895744,692897791,NG
 692897792,692905983,ZA
 692905984,692908031,ZW
+692908032,692910079,BW
+692910080,692912127,NG
+692912128,692914175,ZM
 692969472,692971519,TZ
 692973568,692975615,MZ
 692975616,692977663,EG
@@ -1334,6 +1358,7 @@
 693026816,693027839,MU
 693027840,693028863,CD
 693028864,693029887,ZA
+693029888,693030911,CM
 693101568,693102591,KE
 693102592,693103615,CD
 693103616,693104639,GN
@@ -1347,6 +1372,7 @@
 693411840,693420031,NG
 693420032,693428223,UG
 693428224,693436415,SZ
+693469184,693501951,ZA
 693501952,693510143,LR
 693510144,693518335,SC
 693518336,693534719,ZA
@@ -1731,11 +1757,9 @@
 702537728,702538751,RW
 702538752,702539775,TZ
 702539776,702540799,BF
-702540800,702541823,MU
 702541824,702542847,EG
 702542848,702543871,ZA
 702543872,702544895,BJ
-702544896,702545919,MU
 702545920,703070207,TN
 703070208,703594495,EG
 703594496,704118783,ZA
@@ -1747,7 +1771,11 @@
 771751936,771817471,RU
 771817472,771948543,TR
 771948544,772014079,RU
-772014080,772057727,DE
+772014080,772051223,DE
+772051224,772051231,CH
+772051232,772054815,DE
+772054816,772054847,ES
+772054848,772057727,DE
 772057728,772057735,IT
 772057736,772145151,DE
 772145152,772210687,ES
@@ -1762,7 +1790,11 @@
 772734976,772800511,NO
 772800512,772802559,GB
 772802560,772804607,RU
-772804608,772806655,BZ
+772804608,772806207,BZ
+772806208,772806271,NI
+772806272,772806463,BZ
+772806464,772806527,NI
+772806528,772806655,BZ
 772806656,772808703,RU
 772808704,772810751,GB
 772810752,772812799,FR
@@ -1809,7 +1841,9 @@
 772886528,772888575,FR
 772888576,772890623,GB
 772890624,772892671,RU
-772892672,772894719,DE
+772892672,772892799,DE
+772892800,772892959,GB
+772892960,772894719,DE
 772894720,772896767,PL
 772896768,772898815,RS
 772898816,772900863,TR
@@ -1923,7 +1957,9 @@
 773156864,773165055,FR
 773165056,773168127,NL
 773168128,773168383,US
-773168384,773173247,NL
+773168384,773169375,NL
+773169376,773169407,BE
+773169408,773173247,NL
 773173248,773177343,IT
 773177344,773181439,FR
 773181440,773185535,PL
@@ -1940,6 +1976,26 @@
 773230592,773234687,RS
 773234688,773238783,PL
 773238784,773242879,NL
+773242880,773246975,FR
+773246976,773251071,EE
+773251072,773255167,AZ
+773255168,773259263,RU
+773259264,773263359,SI
+773263360,773267455,GB
+773267456,773271551,LV
+773271552,773275647,CZ
+773275648,773277695,GB
+773277696,773283839,NL
+773283840,773287935,AZ
+773287936,773292031,JO
+773292032,773296127,CZ
+773296128,773300223,RU
+773300224,773304319,FI
+773304320,773308415,RU
+773308416,773312511,IT
+773312512,773316607,DE
+773316608,773320703,RU
+773320704,773324799,FR
 773324800,773586943,ES
 773586944,773588991,IT
 773588992,773591039,PL
@@ -2102,7 +2158,9 @@
 774029312,774037503,RO
 774037504,774045695,SK
 774045696,774053887,FR
-774053888,774061567,DE
+774053888,774055935,DE
+774055936,774057983,US
+774057984,774061567,DE
 774061568,774061695,BZ
 774061696,774061823,DE
 774061824,774061951,BZ
@@ -2230,21 +2288,72 @@
 774161735,774161744,UA
 774161745,774161754,NP
 774161755,774161764,PG
-774161765,774168575,VA
+774161765,774161774,ZA
+774161775,774161784,SN
+774161785,774161794,MA
+774161795,774161804,BH
+774161805,774161814,JE
+774161815,774161824,TV
+774161825,774161834,PF
+774161835,774161844,SB
+774161845,774161854,VU
+774161855,774161864,AN
+774161865,774161940,VA
+774161941,774161950,LI
+774161951,774168575,VA
 774168576,774176767,PL
 774176768,774184959,IT
 774184960,774193151,GB
 774193152,774209535,ES
 774209536,774217727,RU
-774217728,774224127,GB
-774224128,774224159,CN
-774224160,774225279,GB
-774225280,774225343,CN
-774225344,774225359,GB
+774217728,774222847,GB
+774222848,774222863,UA
+774222864,774222879,TR
+774222880,774222911,GB
+774222912,774222975,CN
+774222976,774223103,GB
+774223104,774223119,UA
+774223120,774223135,TR
+774223136,774223359,GB
+774223360,774223375,UA
+774223376,774223951,GB
+774223952,774223959,RU
+774223960,774223967,CN
+774223968,774223975,RU
+774223976,774223983,PK
+774223984,774223991,RU
+774223992,774223999,PK
+774224000,774224007,IT
+774224008,774224039,CN
+774224040,774224127,GB
+774224128,774224159,BE
+774224160,774224223,US
+774224224,774224255,LT
+774224256,774224383,GB
+774224384,774224399,UA
+774224400,774224407,LT
+774224408,774224415,PK
+774224416,774224423,IT
+774224424,774224431,GB
+774224432,774224439,CN
+774224440,774224447,GB
+774224448,774224511,CN
+774224512,774224767,GB
+774224768,774224831,CN
+774224832,774224847,UA
+774224848,774224863,RU
+774224864,774225023,GB
+774225024,774225055,CN
+774225056,774225151,RU
+774225152,774225343,GB
+774225344,774225351,PK
+774225352,774225359,LT
 774225360,774225375,UA
-774225376,774225391,GB
+774225376,774225391,RU
 774225392,774225407,UA
-774225408,774225599,GB
+774225408,774225535,GB
+774225536,774225567,CN
+774225568,774225599,RU
 774225600,774225615,PK
 774225616,774225631,GB
 774225632,774225647,CN
@@ -2254,19 +2363,29 @@
 774225680,774225687,CN
 774225688,774225695,CA
 774225696,774225703,RU
-774225704,774225711,LK
+774225704,774225711,GB
 774225712,774225719,PK
 774225720,774225791,GB
 774225792,774225807,UA
-774225808,774225823,GB
+774225808,774225823,RU
 774225824,774225919,US
 774225920,774234111,UA
 774234112,774242303,IT
 774242304,774258687,RU
 774258688,774266879,SA
 774266880,774275071,RU
-774275072,774283263,IR
+774275072,774275327,GB
+774275328,774283263,IR
 774283264,774291455,GB
+774291456,774299647,NL
+774299648,774307839,DE
+774307840,774324223,RU
+774324224,774332415,UA
+774332416,774340607,SE
+774340608,774348799,EE
+774348800,774356991,CZ
+774356992,774365183,ES
+774365184,774373375,RU
 774373376,774389759,RS
 774389760,774406143,BG
 774406144,774422527,IT
@@ -2292,7 +2411,8 @@
 774750208,774782975,RU
 774782976,774799359,UA
 774799360,774815743,RU
-774815744,774832127,SE
+774815744,774823935,NO
+774823936,774832127,SE
 774832128,774848511,RU
 774848512,774864895,BG
 774864896,774881279,CZ
@@ -2365,8 +2485,135 @@
 780468224,780533759,UA
 780533760,780599295,PL
 780599296,780664831,CZ
-780664832,780664960,NL
-780664961,780730367,FR
+780664832,780665087,NL
+780665088,780665343,DE
+780665344,780665599,FR
+780665600,780665855,GB
+780665856,780666111,SA
+780666112,780666367,IT
+780666368,780666623,AX
+780666624,780666879,AF
+780666880,780667135,AL
+780667136,780667391,DZ
+780667392,780667647,AS
+780667648,780667903,AD
+780667904,780668159,AM
+780668160,780668415,AT
+780668416,780668671,AZ
+780668672,780668927,BH
+780668928,780669183,BY
+780669184,780669439,BE
+780669440,780669695,BA
+780669696,780669951,BG
+780669952,780670207,HR
+780670208,780670463,CY
+780670464,780670719,CZ
+780670720,780670975,DK
+780670976,780671231,EE
+780671232,780671487,FO
+780671488,780671743,FI
+780671744,780671999,FR
+780672000,780672255,GE
+780672256,780672511,DE
+780672512,780672767,GI
+780672768,780673023,GR
+780673024,780673279,GL
+780673280,780673535,GG
+780673536,780673791,VA
+780673792,780674047,HU
+780674048,780674303,IS
+780674304,780674559,IR
+780674560,780674815,IQ
+780674816,780675071,IE
+780675072,780675327,IM
+780675328,780675583,IL
+780675584,780675839,IT
+780675840,780676095,JE
+780676096,780676351,JO
+780676352,780676607,KZ
+780676608,780676863,KW
+780676864,780677119,KG
+780677120,780677375,LV
+780677376,780677631,LB
+780677632,780677887,LI
+780677888,780678143,LT
+780678144,780678399,LU
+780678400,780678655,MK
+780678656,780678911,MT
+780678912,780679167,MD
+780679168,780679423,MC
+780679424,780679679,ME
+780679680,780679935,NL
+780679936,780680447,NO
+780680448,780680703,PS
+780680704,780680959,PL
+780680960,780681215,PT
+780681216,780681471,QA
+780681472,780681727,RO
+780681728,780681983,RU
+780681984,780682239,SM
+780682240,780682495,SA
+780682496,780682751,RS
+780682752,780683007,SK
+780683008,780683263,SI
+780683264,780683519,ES
+780683520,780683775,SJ
+780683776,780684031,SE
+780684032,780684287,CH
+780684288,780684543,SY
+780684544,780684799,TJ
+780684800,780685055,TR
+780685056,780685311,TM
+780685312,780685567,UA
+780685568,780685823,AE
+780685824,780686079,GB
+780686080,780686335,UZ
+780686336,780686591,YE
+780686592,780686847,AX
+780686848,780687103,AL
+780687104,780687359,AD
+780687360,780687615,AM
+780687616,780687871,AT
+780687872,780688127,AZ
+780688128,780688383,BH
+780688384,780688639,BY
+780688640,780688895,BE
+780688896,780689151,BA
+780689152,780689407,BG
+780689408,780689663,HR
+780689664,780689919,CY
+780689920,780690175,CZ
+780690176,780690431,DK
+780690432,780690687,EE
+780690688,780690943,FO
+780690944,780691199,FI
+780691200,780691455,FR
+780691456,780691711,GE
+780691712,780691967,DE
+780691968,780692223,GI
+780692224,780692479,GR
+780692480,780692735,GL
+780692736,780692991,GG
+780692992,780693247,VA
+780693248,780693503,HU
+780693504,780693759,IS
+780693760,780694015,IR
+780694016,780694271,IQ
+780694272,780694527,IE
+780694528,780694783,IL
+780694784,780695039,IT
+780695040,780695295,JE
+780695296,780695551,JO
+780695552,780695807,KZ
+780695808,780696063,KW
+780696064,780696319,LB
+780696320,780696575,LI
+780696576,780696831,LT
+780696832,780697087,LU
+780697088,780697343,MK
+780697344,780697599,MT
+780697600,780697855,NL
+780697856,780730367,FR
 780730368,780795903,IE
 780795904,780861439,RU
 780861440,780926975,HU
@@ -2385,7 +2632,17 @@
 781479936,781484031,UA
 781484032,781488127,RU
 781488128,781496319,PL
-781496320,781504511,RU
+781496320,781516799,RU
+781516800,781520895,RO
+781520896,781524991,IS
+781524992,781529087,RU
+781529088,781533183,UA
+781533184,781537279,RU
+781537280,781545471,UA
+781545472,781549567,CZ
+781549568,781553663,RU
+781553664,781557759,PL
+781557760,781561855,UA
 781582336,781590527,UA
 781590528,781598719,SI
 781598720,781615103,UA
@@ -2405,6 +2662,21 @@
 781674496,781676543,RU
 781676544,781678591,PL
 781678592,781682687,RS
+781682688,781684735,PL
+781684736,781686783,UA
+781686784,781688831,RU
+781688832,781690879,RO
+781690880,781692927,RU
+781692928,781694975,UA
+781694976,781697023,PL
+781697024,781699071,UA
+781699072,781701119,RO
+781701120,781703167,SA
+781703168,781705215,PL
+781705216,781707263,RO
+781707264,781709311,SI
+781709312,781711359,RU
+781711360,781713407,UA
 781713408,781844479,SA
 781844480,781975551,TR
 781975552,782106623,GB
@@ -2420,7 +2692,51 @@
 782385152,782401535,SE
 782401536,782417919,FR
 782417920,782434303,AM
-782761984,782893055,PL
+782434304,782450687,SI
+782450688,782467071,DE
+782467072,782483455,RU
+782483456,782499839,FI
+782499840,782516223,SI
+782516224,782532607,IR
+782532608,782548991,UA
+782548992,782581759,RU
+782581760,782598143,FR
+782598144,782630911,DE
+782630912,782647295,MD
+782647296,782663679,RU
+782663680,782664191,GB
+782664192,782664447,DK
+782664448,782664959,FR
+782664960,782665471,NL
+782665472,782680063,GB
+782680064,782696447,RU
+782696448,782712831,DE
+782712832,782729215,RU
+782745600,782761983,CZ
+782761984,783024127,PL
+783040512,783048703,UA
+783048704,783056895,RU
+783056896,783065087,UA
+783065088,783073279,RU
+783073280,783081471,UA
+783155200,783157247,PL
+783157248,783159295,RU
+783159296,783161343,CZ
+783161344,783163391,PL
+783163392,783165439,CZ
+783165440,783167487,UA
+783167488,783169535,RU
+783169536,783171583,CZ
+783171584,783173631,UA
+783173632,783175679,PL
+783175680,783179775,RU
+783179776,783181823,RS
+783181824,783185919,RU
+783185920,783187967,UA
+783187968,783190015,NL
+783286272,783417343,GR
+783417344,783548415,BE
+783548416,783679487,RU
 783679488,783681535,FR
 783681536,783683583,IE
 783683584,783685631,DE
@@ -2428,7 +2744,9 @@
 783687680,783689727,PT
 783689728,783691775,FR
 783691776,783693823,BY
-783693824,783695871,GB
+783693824,783694623,GB
+783694624,783694655,FR
+783694656,783695871,GB
 783695872,783697919,TR
 783697920,783699967,FR
 783699968,783702015,UA
@@ -2444,11 +2762,43 @@
 783722496,783724543,AM
 783724544,783726591,NL
 783726592,783728639,IS
-783728640,783730687,BE
+783728640,783730655,BE
+783730656,783730687,NL
 783730688,783732735,SE
 783732736,783734783,FR
 783734784,783736831,NL
 783736832,783738879,SI
+783738880,783740927,IT
+783740928,783745023,DE
+783745024,783747071,RU
+783747072,783749119,GB
+783749120,783751167,GR
+783751168,783753215,SE
+783753216,783755263,FR
+783755264,783757311,DE
+783757312,783759359,FR
+783759360,783763455,CZ
+783763456,783765503,FI
+783765504,783767551,RU
+783767552,783769599,IL
+783769600,783771647,DE
+783771648,783773695,GB
+783773696,783775743,ES
+783775744,783777791,AL
+783777792,783779839,RU
+783779840,783781887,DK
+783781888,783783935,FR
+783783936,783785983,DE
+783785984,783788031,RU
+783788032,783790079,NO
+783790080,783792127,RU
+783792128,783794175,IR
+783794176,783798271,GB
+783798272,783800319,PL
+783800320,783802367,LV
+783802368,783804415,FR
+783804416,783806463,IT
+783806464,783810559,NL
 783810560,783843327,SA
 783843328,783876095,BH
 783876096,783908863,UA
@@ -2459,6 +2809,116 @@
 784039936,784072703,PL
 784072704,784105471,RU
 784105472,784138239,HR
+784138240,784171007,DE
+784171008,784203775,PT
+784203776,784236543,GR
+784236544,784269311,RO
+784269312,784302079,BY
+784302080,784334847,RU
+784334848,784465919,FR
+784465920,784596991,SE
+784596992,784728063,TR
+784728064,784859135,CY
+785121280,785252351,PL
+785252352,785383423,AT
+785383424,785448959,GB
+785448960,785514495,IR
+785514496,785580031,IL
+785580032,785645567,UA
+785645568,785711103,NO
+785711104,785776639,SY
+785776640,785842175,RO
+785842176,785907711,DE
+785907712,785973247,BY
+785973248,786038783,MK
+787218432,787234815,GB
+787234816,787251199,SE
+787251200,787267583,RU
+787267584,787283967,DE
+787480576,787513343,SA
+787513344,787546111,RS
+787546112,787578879,RU
+787578880,787611647,AM
+787611648,787644415,RU
+787644416,787677183,PL
+787709952,787742719,RU
+787742720,787775487,NL
+787775488,787808255,DE
+788004864,788013055,GB
+788013056,788021247,IR
+788021248,788029439,SI
+788029440,788045823,GB
+788045824,788054015,PL
+788054016,788062207,JO
+788062208,788070399,GB
+788070400,788078591,RU
+788078592,788086783,NL
+788086784,788094975,BG
+788094976,788103167,IR
+788267008,788271103,SE
+788271104,788275199,DE
+788275200,788279295,AL
+788279296,788283391,BG
+788283392,788291583,GB
+788291584,788295679,TR
+788295680,788299775,RU
+788299776,788303871,LV
+788303872,788307967,IT
+788307968,788312063,RU
+788312064,788316159,FR
+788316160,788320255,NL
+788320256,788324351,UA
+788324352,788328447,CZ
+788328448,788332543,RU
+788332544,788336639,BG
+788336640,788340735,DE
+788398080,788400127,SI
+788400128,788402175,SE
+788402176,788406271,RU
+788406272,788410367,IT
+788410368,788412415,TR
+788412416,788414463,SI
+788414464,788416511,CZ
+788416512,788418559,PL
+788418560,788422655,RU
+788422656,788424703,FI
+788424704,788426751,IT
+788426752,788428799,GB
+788428800,788430847,DE
+788430848,788432895,BG
+788432896,788434943,DE
+788434944,788436991,SI
+788436992,788439039,IT
+788439040,788441087,RU
+788441088,788443135,NL
+788443136,788445183,IT
+788445184,788451327,GB
+788451328,788453375,FI
+788453376,788455423,RU
+788455424,788457471,FR
+788457472,788459519,IT
+788459520,788461567,RU
+788461568,788463615,JE
+788463616,788465663,GB
+788465664,788467711,CZ
+788467712,788469759,NO
+788469760,788471807,NL
+788471808,788473855,UA
+788473856,788475903,GB
+788475904,788477951,FR
+788477952,788479999,OM
+788480000,788482047,UZ
+788482048,788484095,GB
+788484096,788486143,IT
+788486144,788488191,NL
+788488192,788490239,RU
+788490240,788492287,NL
+788492288,788494335,GB
+788494336,788496383,SE
+788496384,788498431,FR
+788498432,788500479,RU
+788500480,788502527,AL
+788502528,788504575,IE
 788529152,805306367,CA
 805306368,822083583,US
 822083584,822083839,AP
@@ -2479,7 +2939,7 @@
 823132160,824180735,KR
 824180736,825229311,IN
 825229312,825360383,TH
-825360384,825361407,AP
+825360384,825361407,AU
 825361408,825363455,ID
 825363456,825364479,MY
 825364480,825376767,KR
@@ -2541,6 +3001,16 @@
 832372736,832438271,PH
 832438272,832569343,TW
 832569344,833617919,KR
+833617920,835190783,AU
+835190784,835715071,IN
+835715072,835977215,CN
+835977216,836042751,JP
+836042752,836046847,HK
+836046848,836050943,AU
+836050944,836059135,IN
+836059136,836075519,VN
+836075520,836501503,TW
+836501504,836763647,CN
 836763648,837025791,NZ
 837025792,837287935,TH
 837287936,837550079,CN
@@ -2548,6 +3018,18 @@
 837566464,837599231,KR
 837599232,837603327,MY
 837603328,837604351,VN
+837604352,837605375,NP
+837605376,837607423,ID
+837607424,837611519,JP
+837611520,837615615,AU
+837615616,837681151,TH
+837681152,837689343,JP
+837689344,837697535,IN
+837697536,837746687,KR
+837746688,837763071,CN
+837763072,837779455,JP
+837779456,837795839,KR
+837795840,837812223,CN
 837812224,838074367,JP
 838074368,838139903,NP
 838139904,838205439,SG
@@ -2558,9 +3040,8 @@
 838336512,838467583,IN
 838467584,838729727,JP
 838729728,838795263,KR
-838795264,838860799,AP
-838860800,838926335,US
-838991872,838999039,US
+838795264,838860799,AU
+838860800,838999039,US
 838999040,838999295,CA
 838999296,839010559,US
 839010560,839010815,CA
@@ -2568,7 +3049,11 @@
 839017984,839018239,CA
 839018240,839023359,US
 839023360,839023615,CA
-839023616,843055103,US
+839023616,839061503,US
+839061504,839061759,CA
+839061760,839062271,US
+839062272,839064063,CA
+839064064,843055103,US
 843055104,844103679,CA
 844103680,844627967,US
 847249408,855638015,US
@@ -2612,14 +3097,16 @@
 978583552,978599935,JP
 978599936,978640895,AU
 978640896,978644991,NZ
-978649088,978714623,JP
+978644992,978714623,JP
 978714624,978780159,TW
 978780160,978784255,AU
 978784256,978788351,JP
 978788352,978796543,KR
 978796544,978812927,CN
 978812928,979369983,JP
-979369984,979435519,AU
+979369984,979410943,AU
+979410944,979419135,HK
+979419136,979435519,AU
 979435520,979468287,TH
 979501056,979566591,JP
 979566592,979599359,TW
@@ -2641,6 +3128,7 @@
 982614016,982622207,AU
 982622208,982624255,JP
 982624256,982626303,ID
+982626304,982628351,JP
 982628352,982630399,BD
 982630400,982646783,SG
 982646784,982671359,JP
@@ -2681,6 +3169,7 @@
 995557376,995622911,JP
 995622912,996409343,IN
 996409344,996573183,AU
+996573184,996605951,TW
 996605952,996671487,PK
 996671488,996802559,TW
 996802560,996868095,JP
@@ -2713,7 +3202,7 @@
 1002307584,1002373119,JP
 1002373120,1002405887,CN
 1002405888,1002422271,JP
-1002422272,1002432511,AU
+1002422272,1002434559,AU
 1002434560,1008730111,CN
 1008730112,1009778687,JP
 1009778688,1010237439,MY
@@ -2744,9 +3233,11 @@
 1022558208,1022623743,IN
 1022623744,1022722047,TW
 1022722048,1022754815,CN
+1022754816,1022820351,MO
 1022820352,1022885887,CN
 1022885888,1023148031,TW
 1023148032,1023213567,CN
+1023229952,1023238143,KR
 1023238144,1023246335,ID
 1023246336,1023279103,CN
 1023279104,1023311871,IN
@@ -2755,6 +3246,7 @@
 1023344640,1023410175,CN
 1023410176,1023672319,IN
 1023672320,1023688703,HK
+1023688704,1023692799,MM
 1023692800,1023696895,CN
 1023696896,1023705087,MY
 1023705088,1023717375,JP
@@ -3200,8 +3692,10 @@
 1041699680,1041699695,GB
 1041699696,1041699767,FR
 1041699768,1041699807,GB
-1041699808,1041700539,FR
-1041700540,1041700607,GB
+1041699808,1041700423,FR
+1041700424,1041700535,GB
+1041700536,1041700543,FR
+1041700544,1041700607,GB
 1041700608,1041700983,FR
 1041700984,1041700991,GB
 1041700992,1041701175,FR
@@ -3300,7 +3794,9 @@
 1041706480,1041706487,GB
 1041706488,1041706791,FR
 1041706792,1041706799,GB
-1041706800,1041706951,FR
+1041706800,1041706863,FR
+1041706864,1041706871,GB
+1041706872,1041706951,FR
 1041706952,1041706975,GB
 1041706976,1041706999,FR
 1041707000,1041707007,GB
@@ -3406,9 +3902,7 @@
 1041711584,1041711599,GB
 1041711600,1041711943,FR
 1041711944,1041711951,GB
-1041711952,1041712407,FR
-1041712408,1041712415,GB
-1041712416,1041712423,FR
+1041711952,1041712423,FR
 1041712424,1041712431,GB
 1041712432,1041713095,FR
 1041713096,1041713103,GB
@@ -3434,8 +3928,8 @@
 1041714856,1041714879,GB
 1041714880,1041714911,FR
 1041714912,1041714919,GB
-1041714920,1041714997,FR
-1041714998,1041715007,GB
+1041714920,1041714999,FR
+1041715000,1041715007,GB
 1041715008,1041715055,FR
 1041715056,1041715071,GB
 1041715072,1041715079,FR
@@ -3540,9 +4034,7 @@
 1041719229,1041719231,GB
 1041719232,1041719247,FR
 1041719248,1041719263,GB
-1041719264,1041719383,FR
-1041719384,1041719391,GB
-1041719392,1041719683,FR
+1041719264,1041719683,FR
 1041719684,1041719687,GB
 1041719688,1041719703,FR
 1041719704,1041719711,GB
@@ -3574,7 +4066,9 @@
 1041721816,1041721823,GB
 1041721824,1041722175,FR
 1041722176,1041722191,GB
-1041722192,1041722223,FR
+1041722192,1041722207,FR
+1041722208,1041722215,GB
+1041722216,1041722223,FR
 1041722224,1041722239,GB
 1041722240,1041722279,FR
 1041722280,1041722383,GB
@@ -3707,10 +4201,10 @@
 1041730240,1041730247,GB
 1041730248,1041730639,FR
 1041730640,1041730655,GB
-1041730656,1041731927,FR
-1041731928,1041731935,GB
-1041731936,1041731975,FR
-1041731976,1041732031,GB
+1041730656,1041731935,FR
+1041731936,1041731967,GB
+1041731968,1041731983,FR
+1041731984,1041732031,GB
 1041732032,1041732055,FR
 1041732056,1041732063,GB
 1041732064,1041732103,FR
@@ -3966,7 +4460,9 @@
 1041745328,1041745343,GB
 1041745344,1041745359,FR
 1041745360,1041745375,GB
-1041745376,1041745415,FR
+1041745376,1041745399,FR
+1041745400,1041745407,GB
+1041745408,1041745415,FR
 1041745416,1041745423,GB
 1041745424,1041745447,FR
 1041745448,1041745471,GB
@@ -4807,7 +5303,9 @@
 1044053504,1044106239,NL
 1044106240,1044106367,BE
 1044106368,1044106495,NL
-1044106496,1044106763,BE
+1044106496,1044106751,BE
+1044106752,1044106755,NL
+1044106756,1044106763,BE
 1044106764,1044106767,NL
 1044106768,1044106771,BE
 1044106772,1044106775,NL
@@ -4981,7 +5479,9 @@
 1044697856,1044698110,DE
 1044698111,1044698111,AT
 1044698112,1044698367,DE
-1044698368,1044701183,AT
+1044698368,1044698623,AT
+1044698624,1044699134,DE
+1044699135,1044701183,AT
 1044701184,1044709375,EG
 1044709376,1044717567,RU
 1044717568,1044742143,GB
@@ -5177,9 +5677,7 @@
 1044935408,1044935423,GB
 1044935424,1044935431,BE
 1044935432,1044935439,LU
-1044935440,1044935551,BE
-1044935552,1044935559,GB
-1044935560,1044935595,BE
+1044935440,1044935595,BE
 1044935596,1044935599,GB
 1044935600,1044935623,BE
 1044935624,1044935631,GB
@@ -5279,7 +5777,9 @@
 1045013232,1045013247,IE
 1045013248,1045013455,GB
 1045013456,1045013471,IE
-1045013472,1045018207,GB
+1045013472,1045018143,GB
+1045018144,1045018151,AE
+1045018152,1045018207,GB
 1045018208,1045018231,FI
 1045018232,1045018367,GB
 1045018368,1045018559,ES
@@ -5527,11 +6027,13 @@
 1046285120,1046285183,MT
 1046285184,1046285247,BZ
 1046285248,1046285311,BA
-1046285312,1046286663,DE
+1046285312,1046286335,DE
+1046286336,1046286399,BZ
+1046286400,1046286663,DE
 1046286664,1046286671,BZ
-1046286672,1046286927,DE
-1046286928,1046286935,ES
-1046286936,1046288383,DE
+1046286672,1046286935,DE
+1046286936,1046286943,ES
+1046286944,1046288383,DE
 1046288384,1046288663,CZ
 1046288664,1046288767,DE
 1046288768,1046288775,AG
@@ -6054,10 +6556,9 @@
 1046896384,1046897663,GB
 1046897664,1046898431,BE
 1046898432,1046898687,EU
-1046898688,1046898975,BE
-1046898976,1046899167,EU
+1046898688,1046898943,BE
+1046898944,1046899167,EU
 1046899168,1046904831,BE
-1046904832,1046937599,RU
 1046937600,1047003135,GR
 1047003136,1047068671,DE
 1047068672,1047085055,RU
@@ -6176,7 +6677,8 @@
 1047566948,1047566951,AT
 1047566952,1047566963,DE
 1047566964,1047566967,AT
-1047566968,1047566995,DE
+1047566968,1047566971,CH
+1047566972,1047566995,DE
 1047566996,1047566999,CH
 1047567000,1047567031,DE
 1047567032,1047567035,CH
@@ -6217,9 +6719,7 @@
 1047567536,1047567539,CH
 1047567540,1047567551,DE
 1047567552,1047567555,CH
-1047567556,1047567567,DE
-1047567568,1047567571,AT
-1047567572,1047567647,DE
+1047567556,1047567647,DE
 1047567648,1047567651,CH
 1047567652,1047567655,DE
 1047567656,1047567659,CH
@@ -6277,7 +6777,8 @@
 1047732224,1047740415,EU
 1047740416,1047740431,US
 1047740432,1047740447,DE
-1047740448,1047740543,EU
+1047740448,1047740463,IT
+1047740464,1047740543,EU
 1047740544,1047740671,DE
 1047740672,1047740927,A2
 1047740928,1047781663,EU
@@ -7122,8 +7623,8 @@
 1049026560,1049026815,EU
 1049026816,1049031871,DE
 1049031872,1049031903,EU
-1049031904,1049032143,DE
-1049032144,1049032167,EU
+1049031904,1049032135,DE
+1049032136,1049032167,EU
 1049032168,1049032171,DE
 1049032172,1049032175,EU
 1049032176,1049032287,DE
@@ -7142,8 +7643,8 @@
 1049100288,1049231359,GB
 1049231360,1049296895,DE
 1049296896,1049362431,EG
-1049362432,1049362591,DE
-1049362592,1049362943,GB
+1049362432,1049362623,DE
+1049362624,1049362943,GB
 1049362944,1049362959,DE
 1049362960,1049363071,GB
 1049363072,1049363135,DE
@@ -7582,10 +8083,12 @@
 1051918336,1051919359,PL
 1051919360,1051920383,AT
 1051920384,1051922431,PL
-1051922432,1051983871,AT
+1051922432,1051949823,AT
+1051949824,1051949951,NL
+1051949952,1051983871,AT
 1051983872,1051986687,EU
-1051986688,1051987199,DE
-1051987200,1051991807,EU
+1051986688,1051986943,DE
+1051986944,1051991807,EU
 1051991808,1051991935,DE
 1051991936,1051992063,EU
 1051992064,1051994639,DE
@@ -8724,9 +9227,7 @@
 1052684608,1052770303,GB
 1052770304,1052775711,CH
 1052775712,1052775727,DE
-1052775728,1052775759,CH
-1052775760,1052775767,GB
-1052775768,1052777503,CH
+1052775728,1052777503,CH
 1052777504,1052777535,IT
 1052777536,1052778495,CH
 1052778496,1052786687,RU
@@ -9074,7 +9575,8 @@
 1053840448,1053840511,DE
 1053840512,1053843199,EU
 1053843200,1053843231,DK
-1053843232,1053843711,EU
+1053843232,1053843247,GB
+1053843248,1053843711,EU
 1053843712,1053843967,DE
 1053843968,1053844223,GB
 1053844224,1053844479,DE
@@ -9721,15 +10223,13 @@
 1065611264,1065615359,PR
 1065615360,1065811967,US
 1065811968,1065820159,CA
-1065824256,1065873407,US
+1065820160,1065873407,US
 1065873408,1065877503,PR
 1065877504,1065906175,US
 1065906176,1065908223,KY
 1065908224,1065926815,US
 1065926816,1065926831,CA
-1065926832,1066139647,US
-1066203904,1066204031,US
-1066401792,1066404607,US
+1065926832,1066404607,US
 1066404608,1066404863,A2
 1066404864,1066475263,US
 1066475264,1066475519,CA
@@ -10378,7 +10878,9 @@
 1075577272,1075577279,GB
 1075577280,1075577311,NO
 1075577312,1075577599,GB
-1075577600,1075577775,NO
+1075577600,1075577615,NO
+1075577616,1075577623,GB
+1075577624,1075577775,NO
 1075577776,1075577791,GB
 1075577792,1075577855,NO
 1075577856,1075578111,GB
@@ -10486,8 +10988,8 @@
 1075972352,1075973887,US
 1075973888,1075974143,CA
 1075974144,1075975167,US
-1075975168,1075975423,CA
-1075975424,1075976191,US
+1075975168,1075975935,CA
+1075975936,1075976191,US
 1075976192,1075976511,CA
 1075976512,1075976543,US
 1075976544,1075976647,CA
@@ -10688,9 +11190,7 @@
 1076026976,1076027031,US
 1076027032,1076027263,CA
 1076027264,1076027295,US
-1076027296,1076027391,CA
-1076027392,1076027399,US
-1076027400,1076027407,CA
+1076027296,1076027407,CA
 1076027408,1076027423,US
 1076027424,1076027711,CA
 1076027712,1076027727,US
@@ -10789,11 +11289,15 @@
 1076049472,1076049503,PR
 1076049504,1076049919,US
 1076049920,1076050175,IL
-1076050176,1076166655,US
+1076050176,1076174847,US
+1076174848,1076178943,BM
+1076178944,1076183039,US
 1076183040,1076183071,IN
 1076183072,1076183231,US
 1076183232,1076183295,CA
-1076183296,1076183807,US
+1076183296,1076183423,US
+1076183424,1076183487,IN
+1076183488,1076183807,US
 1076183808,1076184063,CA
 1076184064,1076184095,VE
 1076184096,1076184127,US
@@ -10854,7 +11358,10 @@
 1076189344,1076189407,US
 1076189408,1076189439,IN
 1076189440,1076189695,US
-1076189696,1076189951,CA
+1076189696,1076189759,IN
+1076189760,1076189823,CA
+1076189824,1076189887,US
+1076189888,1076189951,CA
 1076189952,1076190079,US
 1076190080,1076190143,IN
 1076190144,1076190175,BE
@@ -10870,13 +11377,13 @@
 1076190946,1076191231,US
 1076191232,1076191487,CA
 1076191488,1076192063,US
-1076192064,1076192191,CA
+1076192064,1076192127,IN
+1076192128,1076192191,CA
 1076192192,1076192255,US
 1076192256,1076192383,BE
 1076192384,1076192639,US
 1076192640,1076192767,CA
-1076192768,1076192831,IN
-1076192832,1076192895,KR
+1076192768,1076192895,IN
 1076192896,1076193055,US
 1076193056,1076193087,AU
 1076193088,1076193151,US
@@ -11317,9 +11824,7 @@
 1076764672,1076765183,A1
 1076765184,1076765439,CA
 1076765440,1076765695,A1
-1076765696,1076766783,CA
-1076766784,1076766847,A1
-1076766848,1076767231,CA
+1076765696,1076767231,CA
 1076767232,1076767743,A1
 1076767744,1076768511,CA
 1076768512,1076768767,A1
@@ -11689,13 +12194,17 @@
 1077839104,1077839119,ES
 1077839120,1077839543,US
 1077839544,1077839551,ES
-1077839552,1077841151,US
+1077839552,1077840383,US
+1077840384,1077840511,A1
+1077840512,1077841151,US
 1077841152,1077841407,GB
 1077841408,1077841671,US
 1077841672,1077841679,ES
 1077841680,1077843719,US
 1077843720,1077843727,CN
-1077843728,1077846271,US
+1077843728,1077844383,US
+1077844384,1077844391,A1
+1077844392,1077846271,US
 1077846272,1077846527,JP
 1077846528,1077848575,US
 1077848576,1077848831,GR
@@ -11749,7 +12258,10 @@
 1077870336,1077870591,CN
 1077870592,1077936137,US
 1077936138,1077936141,CN
-1077936142,1077936169,US
+1077936142,1077936149,US
+1077936150,1077936150,NL
+1077936151,1077936151,GB
+1077936152,1077936169,US
 1077936170,1077936173,CA
 1077936174,1077936177,GB
 1077936178,1077936189,US
@@ -11779,7 +12291,7 @@
 1077936322,1077936325,GB
 1077936326,1077936329,MX
 1077936330,1077936345,US
-1077936346,1077936349,PE
+1077936346,1077936349,DO
 1077936350,1077936351,IN
 1077936352,1077936365,US
 1077936366,1077936369,NO
@@ -11928,11 +12440,17 @@
 1077940206,1077940209,IT
 1077940210,1077940213,US
 1077940214,1077940217,MX
-1077940218,1077960839,US
+1077940218,1077960751,US
+1077960752,1077960759,CA
+1077960760,1077960839,US
 1077960840,1077960847,CA
 1077960848,1077960943,US
 1077960944,1077960951,CO
-1077960952,1077977087,US
+1077960952,1077965855,US
+1077965856,1077965887,BA
+1077965888,1077968831,US
+1077968832,1077968839,CA
+1077968840,1077977087,US
 1077977088,1077985279,CA
 1077985280,1077993471,US
 1077993472,1078001663,CA
@@ -11984,7 +12502,9 @@
 1078283264,1078283264,US
 1078283265,1078283375,CA
 1078283376,1078283391,MX
-1078283392,1078283423,US
+1078283392,1078283399,US
+1078283400,1078283407,MX
+1078283408,1078283423,US
 1078283424,1078283487,CA
 1078283488,1078283503,US
 1078283504,1078283551,CA
@@ -12136,7 +12656,9 @@
 1078435424,1078435455,HK
 1078435456,1078435471,US
 1078435472,1078435479,BM
-1078435480,1078436719,US
+1078435480,1078435871,US
+1078435872,1078435879,A1
+1078435880,1078436719,US
 1078436720,1078436727,JP
 1078436728,1078436767,US
 1078436768,1078436799,GB
@@ -12153,10 +12675,11 @@
 1078439680,1078439935,NL
 1078439936,1078440127,US
 1078440128,1078440159,MX
-1078440160,1078452991,US
+1078440160,1078443799,US
+1078443800,1078443807,A1
+1078443808,1078452991,US
 1078452992,1078453247,AZ
-1078453248,1078453759,IN
-1078453760,1078453887,US
+1078453248,1078453887,US
 1078453888,1078453903,AF
 1078453904,1078453935,US
 1078453936,1078453951,AT
@@ -12172,9 +12695,13 @@
 1078456320,1078460415,CA
 1078460416,1078517759,US
 1078517760,1078525951,CA
-1078525952,1078581311,US
+1078525952,1078576639,US
+1078576640,1078576895,CA
+1078576896,1078581311,US
 1078581312,1078581327,CR
-1078581328,1078600639,US
+1078581328,1078581503,US
+1078581504,1078581759,CA
+1078581760,1078600639,US
 1078600640,1078600647,GB
 1078600648,1078615679,US
 1078615680,1078615711,GB
@@ -12184,7 +12711,9 @@
 1078651056,1078651071,CA
 1078651072,1078653695,US
 1078653696,1078653727,CZ
-1078653728,1078660799,US
+1078653728,1078654431,US
+1078654432,1078654439,AU
+1078654440,1078660799,US
 1078660800,1078660831,CN
 1078660832,1078661807,US
 1078661808,1078661823,IN
@@ -12204,7 +12733,33 @@
 1078750232,1078750239,CA
 1078750240,1078751231,PE
 1078751232,1078753279,CO
-1078753280,1078755327,AR
+1078753280,1078753535,AR
+1078753536,1078753663,US
+1078753664,1078753791,AR
+1078753792,1078754047,US
+1078754048,1078754207,AR
+1078754208,1078754303,US
+1078754304,1078754559,AR
+1078754560,1078754623,US
+1078754624,1078754655,AR
+1078754656,1078754719,US
+1078754720,1078754751,AR
+1078754752,1078754815,US
+1078754816,1078754823,AR
+1078754824,1078754831,US
+1078754832,1078754855,AR
+1078754856,1078754863,US
+1078754864,1078754927,AR
+1078754928,1078754935,US
+1078754936,1078754951,AR
+1078754952,1078754959,US
+1078754960,1078754975,AR
+1078754976,1078754983,US
+1078754984,1078754991,AR
+1078754992,1078754999,US
+1078755000,1078755055,AR
+1078755056,1078755063,US
+1078755064,1078755327,AR
 1078755328,1078757375,PE
 1078757376,1078757423,CL
 1078757424,1078757439,EC
@@ -12472,8 +13027,8 @@
 1079403936,1079403999,CA
 1079404000,1079404031,US
 1079404032,1079404543,CA
-1079404544,1079404799,US
-1079404800,1079405023,CA
+1079404544,1079404927,US
+1079404928,1079405023,CA
 1079405024,1079405119,US
 1079405120,1079405407,CA
 1079405408,1079405439,BD
@@ -12538,7 +13093,9 @@
 1079576496,1079578623,PR
 1079578624,1079585391,US
 1079585392,1079585407,IN
-1079585408,1079648255,US
+1079585408,1079623679,US
+1079623680,1079627775,PR
+1079627776,1079648255,US
 1079656448,1079664639,US
 1079664640,1079668735,CA
 1079668736,1079827871,US
@@ -13103,9 +13660,13 @@
 1082952704,1082952959,CA
 1082952960,1082982399,US
 1082982400,1083015167,CA
-1083015168,1083263743,US
+1083015168,1083261663,US
+1083261664,1083261679,GB
+1083261680,1083263743,US
 1083263744,1083263999,GB
-1083264000,1083396095,US
+1083264000,1083264447,US
+1083264448,1083264463,GB
+1083264464,1083396095,US
 1083396096,1083400191,BM
 1083400192,1083417727,US
 1083417728,1083417791,CA
@@ -13660,9 +14221,7 @@
 1090448256,1090453503,CA
 1090453504,1090497903,US
 1090497904,1090497919,AU
-1090497920,1091444735,US
-1091444736,1091445247,A2
-1091445248,1091683357,US
+1090497920,1091683357,US
 1091683358,1091683367,GB
 1091683368,1091683387,US
 1091683388,1091683397,LB
@@ -13894,7 +14453,15 @@
 1093112896,1093112911,CA
 1093112912,1093113087,US
 1093113088,1093113119,CA
-1093113120,1093114623,US
+1093113120,1093113127,US
+1093113128,1093113135,CA
+1093113136,1093113151,US
+1093113152,1093113183,CA
+1093113184,1093113503,US
+1093113504,1093113519,CA
+1093113520,1093113759,US
+1093113760,1093113775,CA
+1093113776,1093114623,US
 1093114624,1093114679,CA
 1093114680,1093114703,US
 1093114704,1093114711,CA
@@ -14089,7 +14656,12 @@
 1093725184,1093730303,BB
 1093730304,1093730559,US
 1093730560,1093730815,HK
-1093730816,1093737247,US
+1093730816,1093731071,A1
+1093731072,1093732095,US
+1093732096,1093732351,GB
+1093732352,1093733887,US
+1093733888,1093734143,A1
+1093734144,1093737247,US
 1093737248,1093737263,AE
 1093737264,1093737423,US
 1093737424,1093737431,GB
@@ -14879,7 +15451,9 @@
 1102005248,1102005503,CA
 1102005504,1102005759,PK
 1102005760,1102005823,BE
-1102005824,1102006271,US
+1102005824,1102005887,US
+1102005888,1102005951,IN
+1102005952,1102006271,US
 1102006272,1102006527,CA
 1102006528,1102007295,US
 1102007296,1102007551,PK
@@ -14920,8 +15494,8 @@
 1102012976,1102012991,RU
 1102012992,1102013167,US
 1102013168,1102013183,VE
-1102013184,1102014271,US
-1102014272,1102014335,IN
+1102013184,1102014207,US
+1102014208,1102014335,IN
 1102014336,1102014399,CA
 1102014400,1102016255,US
 1102016256,1102016287,AR
@@ -15447,8 +16021,8 @@
 1110460320,1110460383,US
 1110460384,1110460447,CA
 1110460448,1110460479,US
-1110460480,1110460607,CA
-1110460608,1110460671,US
+1110460480,1110460639,CA
+1110460640,1110460671,US
 1110460672,1110460719,CA
 1110460720,1110460743,US
 1110460744,1110460775,CA
@@ -15787,7 +16361,9 @@
 1116158496,1116168191,US
 1116168192,1116169311,CA
 1116169312,1116169327,US
-1116169328,1116176383,CA
+1116169328,1116175103,CA
+1116175104,1116175135,JM
+1116175136,1116176383,CA
 1116176384,1116210247,US
 1116210248,1116210255,PR
 1116210256,1116210375,US
@@ -16127,7 +16703,7 @@
 1118127232,1118127359,US
 1118127360,1118127615,CA
 1118127616,1118128191,US
-1118128192,1118128255,MY
+1118128192,1118128255,IN
 1118128256,1118128319,CA
 1118128320,1118128383,MY
 1118128384,1118128639,CA
@@ -16147,7 +16723,8 @@
 1118132992,1118133375,CA
 1118133376,1118133503,US
 1118133504,1118133631,CA
-1118133632,1118133759,US
+1118133632,1118133695,US
+1118133696,1118133759,IN
 1118133760,1118133887,CA
 1118133888,1118134783,US
 1118134784,1118134879,CA
@@ -16318,7 +16895,9 @@
 1118794800,1118794815,PR
 1118794816,1118794959,US
 1118794960,1118794975,JM
-1118794976,1118795791,US
+1118794976,1118795407,US
+1118795408,1118795423,PE
+1118795424,1118795791,US
 1118795792,1118795807,AG
 1118795808,1118795895,US
 1118795896,1118795903,CY
@@ -16842,8 +17421,7 @@
 1119502336,1119510527,CA
 1119510528,1119558143,US
 1119558144,1119558655,PR
-1119558656,1119567871,US
-1119571968,1119580159,US
+1119558656,1119580159,US
 1119580160,1119584255,CA
 1119584256,1119999935,US
 1119999936,1119999967,A2
@@ -16952,7 +17530,9 @@
 1120374512,1120374783,US
 1120374784,1120375243,CA
 1120375244,1120375263,US
-1120375264,1120376063,CA
+1120375264,1120375359,CA
+1120375360,1120375551,US
+1120375552,1120376063,CA
 1120376064,1120376079,US
 1120376080,1120376095,CA
 1120376096,1120376127,US
@@ -17082,11 +17662,13 @@
 1120493824,1120494079,CA
 1120494080,1120494335,US
 1120494336,1120494591,CA
-1120494592,1120494975,US
+1120494592,1120494847,US
+1120494848,1120494911,IN
+1120494912,1120494975,US
 1120494976,1120495039,CA
-1120495040,1120495359,US
-1120495360,1120495615,CA
-1120495616,1120495743,US
+1120495040,1120495103,US
+1120495104,1120495167,IN
+1120495168,1120495743,US
 1120495744,1120495871,SG
 1120495872,1120496223,US
 1120496224,1120496255,BE
@@ -17219,8 +17801,8 @@
 1121233584,1121233599,DE
 1121233600,1121239039,CA
 1121239040,1121247231,US
-1121247232,1121247247,CA
-1121247248,1121247255,AG
+1121247232,1121247239,CA
+1121247240,1121247255,AG
 1121247256,1121247263,CA
 1121247264,1121247271,CR
 1121247272,1121247279,CA
@@ -17307,9 +17889,8 @@
 1121250080,1121250095,AG
 1121250096,1121250111,CA
 1121250112,1121250127,CR
-1121250128,1121250151,CA
-1121250152,1121250159,GB
-1121250160,1121250175,CA
+1121250128,1121250143,CA
+1121250144,1121250175,GB
 1121250176,1121250183,AW
 1121250184,1121250207,BZ
 1121250208,1121250239,CA
@@ -17329,7 +17910,9 @@
 1121251056,1121251071,CA
 1121251072,1121251079,GB
 1121251080,1121251087,CY
-1121251088,1121251135,CA
+1121251088,1121251103,CA
+1121251104,1121251119,BZ
+1121251120,1121251135,CA
 1121251136,1121251167,AG
 1121251168,1121251199,VG
 1121251200,1121251263,AW
@@ -17352,7 +17935,8 @@
 1121251808,1121251831,CA
 1121251832,1121251839,VG
 1121251840,1121251847,BZ
-1121251848,1121251871,CA
+1121251848,1121251855,PA
+1121251856,1121251871,CA
 1121251872,1121251887,VG
 1121251888,1121251895,CY
 1121251896,1121251903,CA
@@ -17677,17 +18261,23 @@
 1121483568,1121483575,PT
 1121483576,1121483759,US
 1121483760,1121483775,FR
-1121483776,1121655071,US
+1121483776,1121654863,US
+1121654864,1121654879,IN
+1121654880,1121655071,US
 1121655072,1121655103,RU
 1121655104,1121655231,US
 1121655232,1121655263,AR
 1121655264,1121655439,US
-1121655440,1121655447,VE
-1121655448,1121656063,US
+1121655440,1121655447,IN
+1121655448,1121655455,US
+1121655456,1121655463,IN
+1121655464,1121656063,US
 1121656064,1121656095,NZ
 1121656096,1121714975,US
 1121714976,1121714991,AU
-1121714992,1121715967,US
+1121714992,1121715935,US
+1121715936,1121715943,A1
+1121715944,1121715967,US
 1121715968,1121716095,IT
 1121716096,1121717431,US
 1121717432,1121717439,JP
@@ -17774,9 +18364,7 @@
 1122498560,1122498815,PR
 1122498816,1122499583,US
 1122499584,1122500095,PR
-1122500096,1122506751,US
-1122506752,1122507007,IN
-1122507008,1122525855,US
+1122500096,1122525855,US
 1122525856,1122525865,RU
 1122525866,1122526096,US
 1122526097,1122526111,RU
@@ -18153,7 +18741,11 @@
 1125541152,1125541159,CN
 1125541160,1125541183,CA
 1125541184,1125541215,KY
-1125541216,1125543935,CA
+1125541216,1125541223,CA
+1125541224,1125541231,US
+1125541232,1125543543,CA
+1125543544,1125543551,US
+1125543552,1125543935,CA
 1125543936,1125545983,US
 1125548032,1125548291,CA
 1125548292,1125548351,US
@@ -18164,7 +18756,9 @@
 1125572608,1125576703,CA
 1125576704,1125613567,US
 1125613568,1125617663,CA
-1125617664,1125626111,US
+1125617664,1125623295,US
+1125623296,1125623551,IN
+1125623552,1125626111,US
 1125626112,1125626367,IN
 1125626368,1125626623,US
 1125626624,1125626879,IN
@@ -19053,9 +19647,7 @@
 1137376480,1137376511,CA
 1137376512,1137377311,US
 1137377312,1137377327,DE
-1137377328,1137377471,US
-1137377472,1137377479,IN
-1137377480,1137383455,US
+1137377328,1137383455,US
 1137383456,1137383471,DE
 1137383472,1137426431,US
 1137426432,1137442815,PR
@@ -19278,9 +19870,7 @@
 1137758496,1137758527,AU
 1137758528,1137758671,US
 1137758672,1137758687,CH
-1137758688,1137759999,US
-1137760000,1137760255,PA
-1137760256,1137785855,US
+1137758688,1137785855,US
 1137785856,1137786111,HU
 1137786112,1137795071,US
 1137795072,1137799167,A2
@@ -19337,7 +19927,8 @@
 1137927680,1137927807,CR
 1137927808,1137927935,CA
 1137927936,1137928063,VG
-1137928064,1137928255,CA
+1137928064,1137928191,PA
+1137928192,1137928255,CA
 1137928256,1137928319,BZ
 1137928320,1137930143,CA
 1137930144,1137930159,MT
@@ -19500,7 +20091,9 @@
 1138452016,1138452047,US
 1138452048,1138452055,AU
 1138452056,1138452063,GB
-1138452064,1138452263,US
+1138452064,1138452223,US
+1138452224,1138452231,DE
+1138452232,1138452263,US
 1138452264,1138452271,IN
 1138452272,1138452287,US
 1138452288,1138452295,GR
@@ -19516,11 +20109,13 @@
 1138452456,1138452479,FR
 1138452480,1138453567,US
 1138453568,1138453615,FR
-1138453616,1138454015,US
-1138454016,1138454271,RU
-1138454272,1138454591,US
+1138453616,1138454527,US
+1138454528,1138454543,BR
+1138454544,1138454591,US
 1138454592,1138454599,CA
-1138454600,1138480127,US
+1138454600,1138458111,US
+1138458112,1138458127,BR
+1138458128,1138480127,US
 1138480128,1138482687,AU
 1138482688,1138499583,US
 1138499584,1138503679,CA
@@ -19536,7 +20131,10 @@
 1138508608,1138508671,ID
 1138508672,1138508735,US
 1138508736,1138508767,CR
-1138508768,1138509823,US
+1138508768,1138508799,US
+1138508800,1138509311,PA
+1138509312,1138509631,US
+1138509632,1138509823,PA
 1138509824,1138510847,IN
 1138510848,1138510879,CA
 1138510880,1138510911,US
@@ -19587,7 +20185,9 @@
 1138656199,1138656206,GB
 1138656207,1138656222,US
 1138656223,1138656230,EG
-1138656231,1138656661,US
+1138656231,1138656597,US
+1138656598,1138656605,EG
+1138656606,1138656661,US
 1138656662,1138656669,MA
 1138656670,1138656745,US
 1138656746,1138656753,AE
@@ -19604,13 +20204,17 @@
 1138657236,1138657244,MA
 1138657245,1138657324,US
 1138657325,1138657332,LK
-1138657333,1138657504,US
+1138657333,1138657401,US
+1138657402,1138657409,IN
+1138657410,1138657504,US
 1138657505,1138657520,EG
 1138657521,1138657748,US
 1138657749,1138657780,GB
 1138657781,1138658057,US
 1138658058,1138658123,GB
-1138658124,1138658175,US
+1138658124,1138658131,US
+1138658132,1138658157,EG
+1138658158,1138658175,US
 1138658176,1138658302,GB
 1138658303,1138658431,US
 1138658432,1138658496,PK
@@ -19750,12 +20354,10 @@
 1138663038,1138663166,GB
 1138663167,1138712575,US
 1138712576,1138713583,CA
-1138713584,1138713599,IR
+1138713584,1138713599,MY
 1138713600,1138713927,CA
 1138713928,1138713935,US
-1138713936,1138713951,CA
-1138713952,1138713959,US
-1138713960,1138714039,CA
+1138713936,1138714039,CA
 1138714040,1138714047,US
 1138714048,1138714071,CA
 1138714072,1138714079,US
@@ -19846,7 +20448,11 @@
 1145331712,1145331967,DK
 1145331968,1145333031,US
 1145333032,1145333039,IT
-1145333040,1145333239,US
+1145333040,1145333191,US
+1145333192,1145333199,CN
+1145333200,1145333215,US
+1145333216,1145333223,CN
+1145333224,1145333239,US
 1145333240,1145333247,CN
 1145333248,1145333327,US
 1145333328,1145333343,CN
@@ -19864,8 +20470,14 @@
 1145334056,1145334063,CN
 1145334064,1145334143,US
 1145334144,1145334167,CN
-1145334168,1145334175,HK
-1145334176,1145335167,US
+1145334168,1145334171,HK
+1145334172,1145334175,US
+1145334176,1145334223,CN
+1145334224,1145334231,US
+1145334232,1145334239,CN
+1145334240,1145335103,US
+1145335104,1145335135,NL
+1145335136,1145335167,US
 1145335168,1145335199,CN
 1145335200,1145335215,US
 1145335216,1145335231,CN
@@ -19935,16 +20547,13 @@
 1151944000,1151944063,HK
 1151944064,1151945759,US
 1151945760,1151945791,IE
-1151945792,1151954943,US
-1151959040,1152073727,US
+1151945792,1152073727,US
 1152073728,1152077823,CA
 1152077824,1152581631,US
 1152581632,1152614399,CA
 1152614400,1152778239,US
 1152778240,1152843775,CA
-1152843776,1154488319,US
-1154488320,1154488575,A2
-1154488576,1156071423,US
+1152843776,1156071423,US
 1156071424,1156079615,CA
 1156079616,1156129479,US
 1156129480,1156129487,SG
@@ -19967,7 +20576,9 @@
 1157713664,1157713791,CA
 1157713792,1157755247,US
 1157755248,1157755263,GR
-1157755264,1157931007,US
+1157755264,1157758207,US
+1157758208,1157758463,RU
+1157758464,1157931007,US
 1157931008,1157935103,BS
 1157935104,1157943295,US
 1157943296,1157947391,CA
@@ -20504,7 +21115,7 @@
 1158965168,1158965199,US
 1158965200,1158965215,CA
 1158965216,1158965247,US
-1158965248,1158965255,RU
+1158965248,1158965255,IN
 1158965256,1158965559,US
 1158965560,1158965567,IN
 1158965568,1158965743,US
@@ -20583,7 +21194,7 @@
 1159262736,1159266935,US
 1159266936,1159266943,PR
 1159266944,1159269119,US
-1159269120,1159269375,CA
+1159269120,1159269375,AR
 1159269376,1159274495,US
 1159274496,1159274751,GB
 1159274752,1159276799,US
@@ -20612,7 +21223,9 @@
 1159314368,1159314383,BR
 1159314384,1159314687,US
 1159314688,1159314703,MX
-1159314704,1159318015,US
+1159314704,1159314943,US
+1159314944,1159315199,CR
+1159315200,1159318015,US
 1159318016,1159318047,GB
 1159318048,1159328655,US
 1159328656,1159328671,FR
@@ -20620,9 +21233,12 @@
 1159348224,1159356415,CA
 1159356416,1159421951,US
 1159421952,1159430143,CA
-1159430144,1159441343,US
+1159430144,1159438335,US
+1159438720,1159438847,US
+1159440384,1159440511,US
+1159441024,1159441151,US
 1159441344,1159441375,CA
-1159441376,1159480439,US
+1159442432,1159480439,US
 1159480440,1159480447,CA
 1159480448,1159481167,US
 1159481168,1159481183,VG
@@ -20657,8 +21273,8 @@
 1159517120,1159517151,CA
 1159517152,1159517183,US
 1159517184,1159517327,CA
-1159517328,1159517567,US
-1159517568,1159517599,CA
+1159517328,1159517439,US
+1159517440,1159517599,CA
 1159517600,1159517631,US
 1159517632,1159517663,CA
 1159517664,1159517695,US
@@ -20803,7 +21419,9 @@
 1160017160,1160019967,CA
 1160019968,1160364031,US
 1160364032,1160368127,CA
-1160368128,1160397007,US
+1160368128,1160393727,US
+1160393728,1160396799,CA
+1160396800,1160397007,US
 1160397008,1160397023,GB
 1160397024,1160405631,US
 1160405632,1160406015,DO
@@ -21078,7 +21696,9 @@
 1161314160,1161363455,US
 1161363456,1161367551,CA
 1161367552,1161416703,US
-1161420800,1161421311,AG
+1161420800,1161421151,AG
+1161421152,1161421167,MS
+1161421168,1161421311,AG
 1161421312,1161421567,AI
 1161421568,1161422079,AG
 1161422080,1161422335,VG
@@ -21103,7 +21723,9 @@
 1161426176,1161426943,AG
 1161426944,1161427199,AI
 1161427200,1161427455,VG
-1161427456,1161428223,AG
+1161427456,1161427487,AG
+1161427488,1161427519,MS
+1161427520,1161428223,AG
 1161428224,1161428991,KN
 1161428992,1161453567,US
 1161453568,1161457663,CA
@@ -21122,9 +21744,11 @@
 1161627744,1161627759,US
 1161627760,1161627775,GB
 1161627776,1161627807,US
-1161627808,1161627823,AR
+1161627808,1161627815,HR
+1161627816,1161627823,US
 1161627824,1161627831,AU
-1161627832,1161627863,AR
+1161627832,1161627839,US
+1161627840,1161627863,AR
 1161627864,1161627871,US
 1161627872,1161627879,GB
 1161627880,1161627895,US
@@ -21137,7 +21761,9 @@
 1161628648,1161628655,CA
 1161628656,1161628663,US
 1161628664,1161628671,AR
-1161628672,1161629327,US
+1161628672,1161629231,US
+1161629232,1161629239,AZ
+1161629240,1161629327,US
 1161629328,1161629335,RO
 1161629336,1161629343,NL
 1161629344,1161629391,US
@@ -21296,12 +21922,9 @@
 1161639832,1161639839,AR
 1161639840,1161639887,US
 1161639888,1161639895,AT
-1161639896,1161639951,US
-1161639952,1161639959,IL
+1161639896,1161639959,US
 1161639960,1161639967,GB
-1161639968,1161639999,US
-1161640000,1161640015,PL
-1161640016,1161640023,US
+1161639968,1161640023,US
 1161640024,1161640031,AR
 1161640032,1161640095,US
 1161640096,1161640127,AR
@@ -21339,7 +21962,8 @@
 1161647104,1161647119,PL
 1161647120,1161647135,GB
 1161647136,1161647167,PL
-1161647168,1161650183,US
+1161647168,1161650175,US
+1161650176,1161650183,HR
 1161650184,1161650191,IL
 1161650192,1161650199,US
 1161650200,1161650207,BG
@@ -21386,9 +22010,7 @@
 1161653792,1161653799,SI
 1161653800,1161653831,US
 1161653832,1161653839,HR
-1161653840,1161655807,US
-1161655808,1161656063,IL
-1161656064,1161657615,US
+1161653840,1161657615,US
 1161657616,1161657623,CA
 1161657624,1161657679,US
 1161657680,1161657695,PL
@@ -21408,7 +22030,9 @@
 1161822208,1161832799,US
 1161832800,1161832831,ZA
 1161832832,1161832863,DE
-1161832864,1161833967,US
+1161832864,1161833919,US
+1161833920,1161833951,UA
+1161833952,1161833967,US
 1161833968,1161833975,DE
 1161833976,1161835341,US
 1161835342,1161835353,GR
@@ -21563,8 +22187,10 @@
 1162836992,1162838015,BS
 1162838016,1162870783,US
 1162870784,1162871295,BB
-1162871296,1162874367,LC
-1162874368,1162887167,BB
+1162871296,1162879999,LC
+1162880000,1162882559,DM
+1162882560,1162883839,GD
+1162883840,1162887167,BB
 1162903552,1162925983,US
 1162925984,1162926015,AU
 1162926016,1162926071,US
@@ -21867,9 +22493,7 @@
 1163552576,1163552607,PA
 1163552608,1163552679,CA
 1163552680,1163552687,US
-1163552688,1163553791,CA
-1163553792,1163553807,US
-1163553808,1163553855,CA
+1163552688,1163553855,CA
 1163553856,1163553871,US
 1163553872,1163553919,CA
 1163553920,1163553935,BV
@@ -21881,10 +22505,8 @@
 1163554648,1163554655,MX
 1163554656,1163554703,CA
 1163554704,1163554751,US
-1163554752,1163554815,CA
-1163554816,1163555071,US
-1163555072,1163555327,CA
-1163555328,1163556095,US
+1163554752,1163555839,CA
+1163555840,1163556095,US
 1163556096,1163556607,CA
 1163556608,1163557727,US
 1163557728,1163557759,CA
@@ -21904,7 +22526,9 @@
 1163562208,1163562231,CA
 1163562232,1163562239,US
 1163562240,1163563007,CA
-1163563008,1163566047,US
+1163563008,1163564031,US
+1163564032,1163564799,CA
+1163564800,1163566047,US
 1163566048,1163566079,CA
 1163566080,1163567103,US
 1163567104,1163568127,CA
@@ -22082,7 +22706,9 @@
 1168936960,1168949247,CA
 1168949248,1168949503,US
 1168949504,1168949759,CA
-1168949760,1168950271,US
+1168949760,1168949791,US
+1168949792,1168949823,BB
+1168949824,1168950271,US
 1168950272,1168951823,CA
 1168951824,1168952063,US
 1168952064,1168952095,CA
@@ -22127,9 +22753,7 @@
 1168960832,1168960863,US
 1168960864,1168960887,CA
 1168960888,1168960895,US
-1168960896,1168961887,CA
-1168961888,1168961919,US
-1168961920,1168961983,CA
+1168960896,1168961983,CA
 1168961984,1168961991,US
 1168961992,1168961999,CA
 1168962000,1168962303,US
@@ -22183,10 +22807,12 @@
 1170456960,1170456975,CR
 1170456976,1170456991,US
 1170456992,1170457007,PR
-1170457008,1170458063,US
+1170457008,1170457599,US
+1170457600,1170457663,BR
+1170457664,1170458063,US
 1170458064,1170458079,DE
-1170458080,1170461183,US
-1170461184,1170461439,CO
+1170458080,1170461055,US
+1170461056,1170461439,CO
 1170461440,1170461695,US
 1170461696,1170462719,IL
 1170462720,1170472959,US
@@ -22197,7 +22823,9 @@
 1170505728,1170522111,CA
 1170522112,1170539329,US
 1170539330,1170539330,CN
-1170539331,1170539393,US
+1170539331,1170539331,US
+1170539332,1170539332,CA
+1170539333,1170539393,US
 1170539394,1170539394,TR
 1170539395,1170539399,US
 1170539400,1170539400,TR
@@ -22243,7 +22871,8 @@
 1170544388,1170544391,BD
 1170544392,1170544431,US
 1170544432,1170544439,CN
-1170544440,1170544511,US
+1170544440,1170544443,AU
+1170544444,1170544511,US
 1170544512,1170544575,SE
 1170544576,1170544639,US
 1170544640,1170544767,MY
@@ -22302,9 +22931,7 @@
 1176609664,1176613927,US
 1176613928,1176613935,CA
 1176613936,1176616959,US
-1176616960,1176619007,CA
-1176619008,1176620031,CY
-1176620032,1176620047,CA
+1176616960,1176620047,CA
 1176620048,1176620055,US
 1176620056,1176620095,CA
 1176620096,1176620127,US
@@ -22365,7 +22992,19 @@
 1176686720,1176686751,CA
 1176686752,1176686847,US
 1176686848,1176687103,AN
-1176687104,1176702975,US
+1176687104,1176689407,US
+1176689408,1176689439,DE
+1176689440,1176690175,US
+1176690176,1176690207,FR
+1176690208,1176691199,US
+1176691200,1176691231,GB
+1176691232,1176692735,US
+1176692736,1176692767,BR
+1176692768,1176692991,US
+1176692992,1176693023,CN
+1176693024,1176695295,US
+1176695296,1176695303,TR
+1176695304,1176702975,US
 1176702976,1176707071,CA
 1176707072,1176731647,US
 1176731648,1176735743,PR
@@ -22379,7 +23018,8 @@
 1176770752,1176770783,AE
 1176770784,1176770831,US
 1176770832,1176770847,BR
-1176770848,1176771895,US
+1176770848,1176770851,BM
+1176770852,1176771895,US
 1176771896,1176771903,AE
 1176771904,1176776703,US
 1176776704,1176780799,CA
@@ -22437,13 +23077,7 @@
 1178000920,1178075135,CA
 1178075136,1178599423,US
 1178599424,1179910143,CA
-1179910144,1184805887,US
-1184805888,1184806015,A2
-1184806016,1184811007,US
-1184811008,1184811263,A2
-1184811264,1184829439,US
-1184829440,1184829695,A2
-1184829696,1189130447,US
+1179910144,1189130447,US
 1189130448,1189130463,IN
 1189130464,1190170111,US
 1190170112,1190170127,UY
@@ -22533,7 +23167,11 @@
 1208194088,1208194095,AU
 1208194096,1208194191,US
 1208194192,1208194223,MY
-1208194224,1208195359,US
+1208194224,1208194289,US
+1208194290,1208194291,GB
+1208194292,1208194511,US
+1208194512,1208194513,CA
+1208194514,1208195359,US
 1208195360,1208195375,MY
 1208195376,1208195391,US
 1208195392,1208195399,IN
@@ -22725,7 +23363,9 @@
 1208208256,1208208287,US
 1208208288,1208208303,GB
 1208208304,1208208311,KR
-1208208312,1208208799,US
+1208208312,1208208319,US
+1208208320,1208208321,CA
+1208208322,1208208799,US
 1208208800,1208208807,AU
 1208208808,1208208815,US
 1208208816,1208208831,CA
@@ -22850,7 +23490,9 @@
 1208517632,1208517887,KH
 1208517888,1208518143,US
 1208518144,1208518207,MY
-1208518208,1208518246,US
+1208518208,1208518243,US
+1208518244,1208518244,CN
+1208518245,1208518246,US
 1208518247,1208518247,KH
 1208518248,1208518263,US
 1208518264,1208518264,GB
@@ -22864,7 +23506,9 @@
 1208519168,1208519423,CN
 1208519424,1208519551,US
 1208519552,1208519679,TR
-1208519680,1208523775,US
+1208519680,1208521983,US
+1208521984,1208522239,CN
+1208522240,1208523775,US
 1208523776,1208523903,GB
 1208523904,1208523991,US
 1208523992,1208523995,TR
@@ -23125,11 +23769,15 @@
 1208814688,1208814719,CA
 1208814720,1208814855,US
 1208814856,1208814863,CA
-1208814864,1208832455,US
+1208814864,1208832391,US
+1208832392,1208832407,CN
+1208832408,1208832455,US
 1208832456,1208832463,CN
 1208832464,1208832567,US
 1208832568,1208832575,CN
-1208832576,1208832599,US
+1208832576,1208832583,US
+1208832584,1208832591,CN
+1208832592,1208832599,US
 1208832600,1208832607,CN
 1208832608,1208832623,IT
 1208832624,1208832631,NZ
@@ -23141,7 +23789,12 @@
 1208833024,1208833031,PR
 1208833032,1208833439,US
 1208833440,1208833471,GB
-1208833472,1208852479,US
+1208833472,1208834967,US
+1208834968,1208834975,ID
+1208834976,1208834991,US
+1208834992,1208834999,NP
+1208835000,1208835007,CA
+1208835008,1208852479,US
 1208852480,1208860671,CA
 1208860672,1208918015,US
 1208918016,1208920007,CA
@@ -23211,13 +23864,18 @@
 1209271876,1209271967,US
 1209271968,1209271971,VN
 1209271972,1209271975,TR
-1209271976,1209271995,US
+1209271976,1209271979,CA
+1209271980,1209271995,US
 1209271996,1209271999,FR
 1209272000,1209272015,US
 1209272016,1209272019,GB
 1209272020,1209272031,US
 1209272032,1209272035,GB
-1209272036,1209272407,US
+1209272036,1209272127,US
+1209272128,1209272159,CN
+1209272160,1209272383,US
+1209272384,1209272399,CA
+1209272400,1209272407,US
 1209272408,1209272415,PE
 1209272416,1209272447,US
 1209272448,1209272479,KH
@@ -23231,7 +23889,9 @@
 1209272896,1209272959,CN
 1209272960,1209273215,US
 1209273216,1209273279,CN
-1209273280,1209273647,US
+1209273280,1209273555,US
+1209273556,1209273559,CA
+1209273560,1209273647,US
 1209273648,1209273655,CN
 1209273656,1209273663,US
 1209273664,1209273671,BD
@@ -23269,14 +23929,16 @@
 1209275925,1209275925,CN
 1209275926,1209275928,US
 1209275929,1209275929,MY
-1209275930,1209275931,US
+1209275930,1209275930,US
+1209275931,1209275931,AU
 1209275932,1209275932,CN
 1209275933,1209276351,US
 1209276352,1209276415,CN
 1209276416,1209276799,US
 1209276800,1209276807,BD
 1209276808,1209276815,FR
-1209276816,1209276911,US
+1209276816,1209276903,US
+1209276904,1209276911,CN
 1209276912,1209276927,TR
 1209276928,1209277087,US
 1209277088,1209277095,FR
@@ -23286,7 +23948,9 @@
 1209277136,1209277143,FR
 1209277144,1209277155,US
 1209277156,1209277156,SE
-1209277157,1209277177,US
+1209277157,1209277159,US
+1209277160,1209277160,CN
+1209277161,1209277177,US
 1209277178,1209277178,FR
 1209277179,1209277575,US
 1209277576,1209277583,BD
@@ -23294,7 +23958,11 @@
 1209278208,1209278463,IE
 1209278464,1209278911,US
 1209278912,1209278919,TR
-1209278920,1209279167,US
+1209278920,1209278975,US
+1209278976,1209279103,CA
+1209279104,1209279119,US
+1209279120,1209279135,CA
+1209279136,1209279167,US
 1209279168,1209279231,VN
 1209279232,1209279615,US
 1209279616,1209279743,GB
@@ -23302,11 +23970,14 @@
 1209279872,1209279935,MY
 1209279936,1209280191,US
 1209280192,1209280255,VN
-1209280256,1209280575,US
+1209280256,1209280495,US
+1209280496,1209280511,CA
+1209280512,1209280575,US
 1209280576,1209280607,FR
 1209280608,1209280619,US
 1209280620,1209280623,GB
-1209280624,1209280959,US
+1209280624,1209280639,CN
+1209280640,1209280959,US
 1209280960,1209280975,GB
 1209280976,1209281247,US
 1209281248,1209281279,CA
@@ -23325,7 +23996,9 @@
 1209283696,1209283703,GB
 1209283704,1209283751,US
 1209283752,1209283759,BD
-1209283760,1209283871,US
+1209283760,1209283807,US
+1209283808,1209283839,CA
+1209283840,1209283871,US
 1209283872,1209283875,TR
 1209283876,1209283967,US
 1209283968,1209284095,GB
@@ -23338,7 +24011,15 @@
 1209284816,1209284831,CN
 1209284832,1209284855,US
 1209284856,1209284863,TR
-1209284864,1209285063,US
+1209284864,1209284999,US
+1209285000,1209285000,CA
+1209285001,1209285003,US
+1209285004,1209285004,CA
+1209285005,1209285017,US
+1209285018,1209285018,CA
+1209285019,1209285021,US
+1209285022,1209285022,CA
+1209285023,1209285063,US
 1209285064,1209285071,TR
 1209285072,1209285183,US
 1209285184,1209285247,TR
@@ -23395,8 +24076,8 @@
 1209866112,1209866143,IN
 1209866144,1209866175,US
 1209866176,1209866207,BE
-1209866208,1209866239,IN
-1209866240,1209866751,US
+1209866208,1209866303,IN
+1209866304,1209866751,US
 1209866752,1209867007,IN
 1209867008,1209867039,NZ
 1209867040,1209867071,BE
@@ -23426,7 +24107,9 @@
 1209890496,1209890559,AU
 1209890560,1209893503,US
 1209893504,1209893519,MX
-1209893520,1209917439,US
+1209893520,1209904959,US
+1209904960,1209904975,GB
+1209904976,1209917439,US
 1209917440,1209925631,CA
 1209925632,1210057039,US
 1210057040,1210057047,JM
@@ -23724,7 +24407,9 @@
 1210091536,1210091543,CA
 1210091544,1210091679,US
 1210091680,1210091687,AU
-1210091688,1210091791,US
+1210091688,1210091723,US
+1210091724,1210091725,GB
+1210091726,1210091791,US
 1210091792,1210091807,CA
 1210091808,1210091839,US
 1210091840,1210091847,CA
@@ -23763,7 +24448,9 @@
 1210094408,1210094415,GB
 1210094416,1210094831,US
 1210094832,1210094847,SG
-1210094848,1210094943,US
+1210094848,1210094855,US
+1210094856,1210094863,SE
+1210094864,1210094943,US
 1210094944,1210094951,GB
 1210094952,1210094959,US
 1210094960,1210094967,GB
@@ -24037,7 +24724,9 @@
 1210119552,1210119559,MX
 1210119560,1210119823,US
 1210119824,1210119831,CA
-1210119832,1210120007,US
+1210119832,1210119881,US
+1210119882,1210119883,GB
+1210119884,1210120007,US
 1210120008,1210120015,IN
 1210120016,1210120847,US
 1210120848,1210120855,MY
@@ -24156,9 +24845,7 @@
 1211308736,1211308751,BV
 1211308752,1211308767,CA
 1211308768,1211308783,US
-1211308784,1211309055,CA
-1211309056,1211309311,US
-1211309312,1211310079,CA
+1211308784,1211310079,CA
 1211310080,1211313219,US
 1211313220,1211313231,IN
 1211313232,1211313431,US
@@ -24199,9 +24886,13 @@
 1211368192,1211368447,EE
 1211368448,1211384279,US
 1211384280,1211384287,GB
-1211384288,1211387983,US
+1211384288,1211384327,US
+1211384328,1211384335,A1
+1211384336,1211387983,US
 1211387984,1211387999,AE
-1211388000,1211388671,US
+1211388000,1211388159,US
+1211388160,1211388287,A1
+1211388288,1211388671,US
 1211388672,1211388687,IT
 1211388688,1211391455,US
 1211391456,1211391487,CN
@@ -24412,12 +25103,14 @@
 1249010688,1249011711,CA
 1249011712,1249019903,US
 1249019904,1249020927,CA
-1249020928,1249027175,US
+1249020928,1249027135,US
+1249027136,1249027143,AU
+1249027144,1249027175,US
 1249027176,1249027183,IN
 1249027184,1249027391,US
 1249027392,1249027407,PH
-1249027408,1249027455,US
-1249027456,1249027471,CA
+1249027408,1249027463,US
+1249027464,1249027471,CA
 1249027472,1249027503,US
 1249027504,1249027519,CA
 1249027520,1249027551,US
@@ -24535,7 +25228,15 @@
 1249396736,1249397759,CA
 1249397760,1249409023,US
 1249409024,1249410047,CA
-1249410048,1249452031,US
+1249410048,1249439823,US
+1249439824,1249439839,BR
+1249439840,1249440063,US
+1249440064,1249440127,AN
+1249440128,1249440255,US
+1249440256,1249440271,AN
+1249440272,1249440279,US
+1249440280,1249440287,FR
+1249440288,1249452031,US
 1249452032,1249453055,CA
 1249453056,1249474559,US
 1249474560,1249475583,CA
@@ -24580,10 +25281,12 @@
 1249804288,1249838847,US
 1249838848,1249838911,IN
 1249838912,1249838975,US
-1249838976,1249839039,IN
-1249839040,1249839423,US
+1249838976,1249839103,IN
+1249839104,1249839423,US
 1249839424,1249839487,VE
-1249839488,1249843231,US
+1249839488,1249839551,US
+1249839552,1249839615,IN
+1249839616,1249843231,US
 1249843232,1249843247,IN
 1249843248,1249843423,US
 1249843424,1249843439,IN
@@ -25233,7 +25936,9 @@
 1255669760,1255735295,CA
 1255735296,1255746799,US
 1255746800,1255746815,BB
-1255746816,1255753215,US
+1255746816,1255750239,US
+1255750240,1255750271,AU
+1255750272,1255753215,US
 1255753216,1255753471,GB
 1255753472,1255768063,US
 1255768064,1255768575,CA
@@ -25257,11 +25962,9 @@
 1256079360,1256087551,KY
 1256087552,1256098559,US
 1256098560,1256098815,CA
-1256098816,1263264273,US
-1263264274,1263264289,PK
-1263264290,1263264305,US
-1263264306,1263264354,PK
-1263264355,1263266623,US
+1256098816,1263264305,US
+1263264306,1263264321,PK
+1263264322,1263266623,US
 1263266624,1263266655,CA
 1263266656,1263267327,US
 1263267328,1263267583,CA
@@ -25277,13 +25980,17 @@
 1263268608,1263268672,CA
 1263268673,1263268769,US
 1263268770,1263268863,CA
-1263268864,1263271423,US
+1263268864,1263270143,US
+1263270144,1263270159,CA
+1263270160,1263271423,US
 1263271424,1263271679,CA
 1263271680,1264717823,US
 1264717824,1264718335,CA
 1264718336,1264736255,US
 1264736256,1264737279,DO
-1264737280,1264762879,US
+1264737280,1264738175,US
+1264738176,1264738207,IL
+1264738208,1264762879,US
 1264762880,1264766975,CA
 1264766976,1264980735,US
 1264980736,1264980743,CA
@@ -25671,13 +26378,13 @@
 1279941000,1279943679,US
 1279943680,1279943743,PR
 1279943744,1279950847,US
-1279950848,1279951103,FI
+1279950848,1279951103,CA
 1279951104,1279951135,US
 1279951136,1279951151,CA
 1279951152,1279951167,US
 1279951168,1279951199,CA
-1279951200,1279951231,US
-1279951232,1279952919,CA
+1279951200,1279951223,US
+1279951224,1279952919,CA
 1279952920,1279952927,VG
 1279952928,1279952943,US
 1279952944,1279953023,CA
@@ -25746,13 +26453,9 @@
 1279960128,1279960143,US
 1279960144,1279960159,CA
 1279960160,1279960215,US
-1279960216,1279960319,CA
-1279960320,1279960335,US
-1279960336,1279960343,CA
+1279960216,1279960343,CA
 1279960344,1279960415,US
-1279960416,1279960479,CA
-1279960480,1279960511,US
-1279960512,1279960527,CA
+1279960416,1279960527,CA
 1279960528,1279960535,US
 1279960536,1279960559,CA
 1279960560,1279962175,US
@@ -26053,7 +26756,7 @@
 1296237312,1296237567,US
 1296237568,1296237823,NL
 1296237824,1296238079,ES
-1296238080,1296238591,IL
+1296238080,1296238591,DE
 1296238592,1296239103,NL
 1296239104,1296239231,FR
 1296239232,1296239359,NL
@@ -26111,7 +26814,10 @@
 1296251328,1296251359,IE
 1296251360,1296251391,DE
 1296251392,1296251775,NL
-1296251776,1296252095,FR
+1296251776,1296252063,FR
+1296252064,1296252079,IT
+1296252080,1296252087,IE
+1296252088,1296252095,FR
 1296252096,1296252111,US
 1296252112,1296252127,GB
 1296252128,1296252143,ES
@@ -26223,9 +26929,7 @@
 1296466432,1296466439,TZ
 1296466440,1296466559,NO
 1296466560,1296466583,NG
-1296466584,1296466607,NO
-1296466608,1296466623,NG
-1296466624,1296466639,NO
+1296466584,1296466639,NO
 1296466640,1296466655,NG
 1296466656,1296466671,BJ
 1296466672,1296466687,NO
@@ -26283,7 +26987,6 @@
 1296613376,1296615423,IT
 1296615424,1296617471,GB
 1296617472,1296619519,ES
-1296619520,1296621567,IT
 1296621568,1296623615,SE
 1296623616,1296625663,BE
 1296625664,1296629759,RU
@@ -26398,7 +27101,6 @@
 1296756736,1296758783,FR
 1296758784,1296760831,RS
 1296760832,1296762879,GB
-1296762880,1296764927,RU
 1296764928,1296769023,AT
 1296769024,1296771071,TR
 1296771072,1296773119,LT
@@ -26442,7 +27144,9 @@
 1297006592,1297022207,BA
 1297022208,1297022463,MD
 1297022464,1297022975,BA
-1297022976,1297039359,LT
+1297022976,1297026815,LT
+1297026816,1297026847,FR
+1297026848,1297039359,LT
 1297039360,1297055743,TR
 1297055744,1297072127,RU
 1297072128,1297074743,PL
@@ -26831,7 +27535,6 @@
 1307701248,1307709439,RU
 1307709440,1307713535,AL
 1307713536,1307717631,IT
-1307717632,1307721727,DK
 1307721728,1307725823,AT
 1307725824,1307729919,CZ
 1307729920,1307734015,RU
@@ -27005,19 +27708,10 @@
 1309933568,1310195711,BE
 1310195712,1310197759,RU
 1310197760,1310199807,CZ
-1310199808,1310201855,IE
+1310199808,1310201599,IE
+1310201600,1310201855,GB
 1310201856,1310203903,RU
-1310203904,1310204191,FR
-1310204192,1310204255,BE
-1310204256,1310204287,FR
-1310204288,1310204321,BE
-1310204322,1310204415,FR
-1310204416,1310204671,BE
-1310204672,1310204675,FR
-1310204676,1310204687,BE
-1310204688,1310204707,FR
-1310204708,1310204715,BE
-1310204716,1310205951,FR
+1310203904,1310205951,FR
 1310205952,1310207999,RU
 1310208000,1310210047,MD
 1310210048,1310212095,RU
@@ -27283,7 +27977,9 @@
 1311272960,1311275007,GB
 1311275008,1311277055,FR
 1311277056,1311279103,IT
-1311279104,1311281151,BG
+1311279104,1311280127,BG
+1311280128,1311280383,MK
+1311280384,1311281151,BG
 1311281152,1311285247,GB
 1311285248,1311289343,IT
 1311289344,1311291391,LB
@@ -27296,7 +27992,9 @@
 1311301632,1311303679,TR
 1311303680,1311307775,GB
 1311307776,1311309823,IS
-1311309824,1311311871,GB
+1311309824,1311311823,GB
+1311311824,1311311824,JE
+1311311825,1311311871,GB
 1311311872,1311315967,CZ
 1311315968,1311316423,PL
 1311316424,1311316439,GB
@@ -27559,7 +28257,9 @@
 1315900736,1315900799,IR
 1315900800,1315900927,AE
 1315900928,1315901223,IR
-1315901224,1315901439,AE
+1315901224,1315901247,AE
+1315901248,1315901279,IR
+1315901280,1315901439,AE
 1315901440,1315905535,UA
 1315905536,1315907583,BA
 1315907584,1315908095,SI
@@ -27678,7 +28378,7 @@
 1317667168,1317667175,NG
 1317667176,1317667191,A2
 1317667192,1317667231,NG
-1317667232,1317667239,GH
+1317667232,1317667239,A2
 1317667240,1317667247,NG
 1317667248,1317667263,A2
 1317667264,1317667271,GB
@@ -27723,7 +28423,7 @@
 1317668192,1317668199,A2
 1317668200,1317668207,BW
 1317668208,1317668215,LR
-1317668216,1317668223,CM
+1317668216,1317668223,A2
 1317668224,1317668239,NG
 1317668240,1317668247,A2
 1317668248,1317668255,NG
@@ -27847,8 +28547,8 @@
 1317670768,1317670775,GH
 1317670776,1317670783,A2
 1317670784,1317670791,GH
-1317670792,1317670807,NG
-1317670808,1317670815,A2
+1317670792,1317670799,NG
+1317670800,1317670815,A2
 1317670816,1317670823,NG
 1317670824,1317670847,A2
 1317670848,1317670855,NG
@@ -27864,8 +28564,7 @@
 1317671240,1317671247,CI
 1317671248,1317671255,NG
 1317671256,1317671263,CI
-1317671264,1317671271,NG
-1317671272,1317671279,A2
+1317671264,1317671279,A2
 1317671280,1317671311,NG
 1317671312,1317671319,A2
 1317671320,1317671327,NG
@@ -27879,8 +28578,7 @@
 1317671392,1317671399,NG
 1317671400,1317671407,IQ
 1317671408,1317671415,UG
-1317671416,1317671423,NG
-1317671424,1317671439,A2
+1317671416,1317671439,A2
 1317671440,1317671487,NG
 1317671488,1317671527,A2
 1317671528,1317671543,NG
@@ -27920,20 +28618,18 @@
 1317672544,1317672551,CD
 1317672552,1317672583,A2
 1317672584,1317672591,CD
-1317672592,1317672599,NG
-1317672600,1317672615,A2
+1317672592,1317672615,A2
 1317672616,1317672623,NG
 1317672624,1317672655,A2
 1317672656,1317672663,CD
-1317672664,1317672679,NG
+1317672664,1317672671,A2
+1317672672,1317672679,NG
 1317672680,1317672727,A2
 1317672728,1317672735,NG
 1317672736,1317672743,LR
 1317672744,1317672759,A2
 1317672760,1317672767,NG
-1317672768,1317672775,A2
-1317672776,1317672783,NG
-1317672784,1317672815,A2
+1317672768,1317672815,A2
 1317672816,1317672823,BW
 1317672824,1317672831,NG
 1317672832,1317672839,A2
@@ -27955,15 +28651,16 @@
 1317673288,1317673335,A2
 1317673336,1317673343,GH
 1317673344,1317673359,A2
-1317673360,1317673375,NG
+1317673360,1317673367,NG
+1317673368,1317673375,A2
 1317673376,1317673383,AO
 1317673384,1317673391,NG
 1317673392,1317673399,A2
 1317673400,1317673407,NG
 1317673408,1317673423,A2
 1317673424,1317673431,NG
-1317673432,1317673447,A2
-1317673448,1317673463,AO
+1317673432,1317673455,A2
+1317673456,1317673463,AO
 1317673464,1317673471,A2
 1317673472,1317673479,NG
 1317673480,1317673495,A2
@@ -27973,8 +28670,8 @@
 1317673552,1317673559,A2
 1317673560,1317673575,NG
 1317673576,1317673583,CD
-1317673584,1317673591,A2
-1317673592,1317673615,NG
+1317673584,1317673599,A2
+1317673600,1317673615,NG
 1317673616,1317673623,A2
 1317673624,1317673631,NG
 1317673632,1317673639,A2
@@ -28063,10 +28760,10 @@
 1317674952,1317674959,NG
 1317674960,1317674967,GH
 1317674968,1317674983,NG
-1317674984,1317674991,A2
-1317674992,1317675007,NG
-1317675008,1317675023,A2
-1317675024,1317675047,NG
+1317674984,1317674999,A2
+1317675000,1317675007,NG
+1317675008,1317675031,A2
+1317675032,1317675047,NG
 1317675048,1317675055,A2
 1317675056,1317675063,NG
 1317675064,1317675071,AO
@@ -28075,8 +28772,8 @@
 1317675104,1317675111,CD
 1317675112,1317675183,A2
 1317675184,1317675199,CM
-1317675200,1317675223,NG
-1317675224,1317675231,A2
+1317675200,1317675215,NG
+1317675216,1317675231,A2
 1317675232,1317675239,LR
 1317675240,1317675247,A2
 1317675248,1317675255,AO
@@ -28091,8 +28788,7 @@
 1317675360,1317675367,NG
 1317675368,1317675375,A2
 1317675376,1317675383,CM
-1317675384,1317675391,NG
-1317675392,1317675407,A2
+1317675384,1317675407,A2
 1317675408,1317675415,NG
 1317675416,1317675423,A2
 1317675424,1317675439,NG
@@ -28144,7 +28840,7 @@
 1317675944,1317675975,NG
 1317675976,1317675983,A2
 1317675984,1317675991,LR
-1317675992,1317675999,A2
+1317675992,1317675999,NG
 1317676000,1317676007,GN
 1317676008,1317676015,GH
 1317676016,1317676023,SD
@@ -28156,18 +28852,19 @@
 1317676072,1317676079,A2
 1317676080,1317676087,AO
 1317676088,1317676095,NG
-1317676096,1317676103,NE
+1317676096,1317676103,A2
 1317676104,1317676111,NG
-1317676112,1317676127,A2
+1317676112,1317676119,CM
+1317676120,1317676127,A2
 1317676128,1317676135,NG
-1317676136,1317676151,A2
+1317676136,1317676143,CM
+1317676144,1317676151,NG
 1317676152,1317676159,CM
 1317676160,1317676167,TG
 1317676168,1317676175,ML
 1317676176,1317676191,A2
 1317676192,1317676207,SD
-1317676208,1317676215,A2
-1317676216,1317676223,GH
+1317676208,1317676223,A2
 1317676224,1317676231,AO
 1317676232,1317676239,NG
 1317676240,1317676247,SD
@@ -28179,7 +28876,8 @@
 1317676288,1317676551,LR
 1317676552,1317676559,AO
 1317676560,1317676567,NG
-1317676568,1317676583,A2
+1317676568,1317676575,LR
+1317676576,1317676583,A2
 1317676584,1317676591,NG
 1317676592,1317676599,AO
 1317676600,1317676607,UG
@@ -28204,41 +28902,38 @@
 1317676800,1317676807,CD
 1317676808,1317676815,NG
 1317676816,1317676823,LR
-1317676824,1317676831,NG
-1317676832,1317676847,A2
+1317676824,1317676847,A2
 1317676848,1317676855,NG
 1317676856,1317676863,A2
 1317676864,1317676871,TG
 1317676872,1317676879,NG
-1317676880,1317676903,A2
-1317676904,1317676927,NG
+1317676880,1317676911,A2
+1317676912,1317676927,NG
 1317676928,1317676943,A2
-1317676944,1317676959,CM
-1317676960,1317676983,A2
+1317676944,1317676951,CM
+1317676952,1317676983,A2
 1317676984,1317676991,NG
 1317676992,1317676999,LR
 1317677000,1317677007,IQ
 1317677008,1317677015,CD
-1317677016,1317677023,GH
-1317677024,1317677031,NG
-1317677032,1317677047,A2
+1317677016,1317677047,A2
 1317677048,1317677055,NG
-1317677056,1317677071,A2
+1317677056,1317677063,UG
+1317677064,1317677071,A2
 1317677072,1317677079,NG
 1317677080,1317677087,SD
 1317677088,1317677143,A2
 1317677144,1317677151,SD
 1317677152,1317677191,A2
 1317677192,1317677199,SD
-1317677200,1317677207,NG
-1317677208,1317677223,A2
-1317677224,1317677231,NG
+1317677200,1317677215,NG
+1317677216,1317677231,A2
 1317677232,1317677239,UG
 1317677240,1317677247,A2
 1317677248,1317677271,NG
 1317677272,1317677295,A2
 1317677296,1317677311,NG
-1317677312,1317677319,A2
+1317677312,1317677319,CD
 1317677320,1317677327,AO
 1317677328,1317677335,CD
 1317677336,1317677343,A2
@@ -28250,62 +28945,73 @@
 1317677408,1317677415,CD
 1317677416,1317677423,A2
 1317677424,1317677431,CD
-1317677432,1317677439,A2
+1317677432,1317677439,LR
 1317677440,1317677455,CD
 1317677456,1317677463,AO
 1317677464,1317677471,A2
 1317677472,1317677479,NG
 1317677480,1317677487,AO
 1317677488,1317677495,A2
-1317677496,1317677503,CD
-1317677504,1317677511,NG
+1317677496,1317677511,NG
 1317677512,1317677519,CD
 1317677520,1317677527,NG
 1317677528,1317677535,GQ
 1317677536,1317677543,A2
 1317677544,1317677551,CD
-1317677552,1317677591,NG
-1317677592,1317677599,A2
-1317677600,1317677711,NG
-1317677712,1317677719,A2
-1317677720,1317677735,NG
-1317677736,1317677743,A2
-1317677744,1317677775,NG
-1317677776,1317677791,A2
-1317677792,1317677823,NG
+1317677552,1317677559,A2
+1317677560,1317677567,NG
+1317677568,1317677663,A2
+1317677664,1317677671,GB
+1317677672,1317677823,A2
 1317677824,1317677831,AO
 1317677832,1317677839,A2
 1317677840,1317677847,LR
 1317677848,1317677855,NG
-1317677856,1317677895,A2
+1317677856,1317677863,BF
+1317677864,1317677871,CM
+1317677872,1317677895,A2
 1317677896,1317677903,GN
-1317677904,1317677959,A2
-1317677960,1317677967,NG
-1317677968,1317678007,A2
+1317677904,1317678007,A2
 1317678008,1317678015,NG
 1317678016,1317678047,A2
 1317678048,1317678055,IQ
-1317678056,1317678143,A2
+1317678056,1317678079,A2
+1317678080,1317678095,NG
+1317678096,1317678103,GQ
+1317678104,1317678111,CD
+1317678112,1317678143,A2
 1317678144,1317678151,CD
-1317678152,1317678167,A2
+1317678152,1317678159,NG
+1317678160,1317678167,GQ
 1317678168,1317678175,NG
 1317678176,1317678207,A2
 1317678208,1317678215,NG
 1317678216,1317678231,A2
 1317678232,1317678239,BF
-1317678240,1317678335,A2
+1317678240,1317678319,A2
+1317678320,1317678327,NG
+1317678328,1317678335,A2
 1317678336,1317678343,NG
-1317678344,1317678375,A2
+1317678344,1317678351,A2
+1317678352,1317678359,CD
+1317678360,1317678367,NG
+1317678368,1317678375,A2
 1317678376,1317678383,NG
-1317678384,1317678439,A2
+1317678384,1317678423,A2
+1317678424,1317678431,NG
+1317678432,1317678439,A2
 1317678440,1317678447,CD
 1317678448,1317678455,A2
 1317678456,1317678463,CD
-1317678464,1317678471,A2
+1317678464,1317678471,NG
 1317678472,1317678479,AO
 1317678480,1317678487,A2
 1317678488,1317678495,NG
-1317678496,1317679615,A2
+1317678496,1317678519,A2
+1317678520,1317678527,NG
+1317678528,1317678543,A2
+1317678544,1317678551,CD
+1317678552,1317679615,A2
 1317679616,1317679631,AO
 1317679632,1317679639,A2
 1317679640,1317679647,ZW
@@ -28349,34 +29055,56 @@
 1317765120,1317781503,GE
 1317781504,1317814271,RU
 1317814272,1317830655,DE
-1317830656,1317832191,NL
+1317830656,1317831807,NL
+1317831808,1317831935,CA
+1317831936,1317832191,NL
 1317832192,1317832447,GB
 1317832448,1317832511,CY
-1317832512,1317832959,NL
+1317832512,1317832575,NL
+1317832576,1317832703,GI
+1317832704,1317832959,NL
 1317832960,1317833215,IT
-1317833216,1317835615,NL
+1317833216,1317835007,NL
+1317835008,1317835071,RU
+1317835072,1317835135,GI
+1317835136,1317835199,RU
+1317835200,1317835263,CY
+1317835264,1317835615,NL
 1317835616,1317835647,RU
-1317835648,1317836863,NL
+1317835648,1317835711,NL
+1317835712,1317835775,GI
+1317835776,1317836031,CY
+1317836032,1317836863,NL
 1317836864,1317836927,CY
 1317836928,1317836991,NL
 1317836992,1317837007,GB
 1317837008,1317838943,NL
 1317838944,1317838959,GB
-1317838960,1317839359,NL
+1317838960,1317838975,NL
+1317838976,1317839103,GI
+1317839104,1317839359,NL
 1317839360,1317839615,RU
 1317839616,1317839679,HK
 1317839680,1317839695,CZ
 1317839696,1317841407,NL
 1317841408,1317841439,SC
-1317841440,1317841663,NL
+1317841440,1317841471,MT
+1317841472,1317841535,CY
+1317841536,1317841599,NL
+1317841600,1317841663,GI
 1317841664,1317841727,HK
 1317841728,1317841855,CY
-1317841856,1317842943,NL
+1317841856,1317841887,IL
+1317841888,1317842943,NL
 1317842944,1317843071,CY
 1317843072,1317843135,HK
 1317843136,1317843199,CY
 1317843200,1317843391,US
-1317843392,1317847039,NL
+1317843392,1317843423,NL
+1317843424,1317843455,PA
+1317843456,1317843519,NL
+1317843520,1317843583,GI
+1317843584,1317847039,NL
 1317847040,1317863423,RU
 1317863424,1317879807,GB
 1317879808,1317896191,SK
@@ -28406,8 +29134,8 @@
 1318008704,1318008767,NL
 1318008768,1318009423,DE
 1318009424,1318009471,NL
-1318009472,1318010527,DE
-1318010528,1318010879,NL
+1318009472,1318010495,DE
+1318010496,1318010879,NL
 1318010880,1318027263,DK
 1318027264,1318043647,IE
 1318043648,1318584319,GB
@@ -28727,9 +29455,7 @@
 1334583808,1334584063,CH
 1334584064,1334584255,DE
 1334584256,1334584287,AT
-1334584288,1334584351,DE
-1334584352,1334584383,LU
-1334584384,1334584999,DE
+1334584288,1334584999,DE
 1334585000,1334585007,US
 1334585008,1334585111,DE
 1334585112,1334585119,AT
@@ -28819,7 +29545,9 @@
 1334730500,1334730503,RU
 1334730504,1334730539,KZ
 1334730540,1334730543,RU
-1334730544,1334730667,KZ
+1334730544,1334730579,KZ
+1334730580,1334730583,RU
+1334730584,1334730667,KZ
 1334730668,1334730687,RU
 1334730688,1334730699,KZ
 1334730700,1334730703,RU
@@ -29062,25 +29790,31 @@
 1346500640,1346500735,IM
 1346500736,1346500767,GB
 1346500768,1346500863,IM
-1346500864,1346501151,GB
-1346501152,1346501247,IM
+1346500864,1346501119,GB
+1346501120,1346501135,IM
+1346501136,1346501231,GB
+1346501232,1346501247,IM
 1346501248,1346501343,GB
 1346501344,1346501375,IM
 1346501376,1346501695,GB
 1346501696,1346501727,IM
 1346501728,1346501743,GB
-1346501744,1346501775,IM
-1346501776,1346501795,GB
-1346501796,1346501823,IM
-1346501824,1346501847,GB
+1346501744,1346501759,IM
+1346501760,1346501795,GB
+1346501796,1346501799,IM
+1346501800,1346501807,GB
+1346501808,1346501839,IM
+1346501840,1346501847,GB
 1346501848,1346501879,IM
-1346501880,1346502223,GB
-1346502224,1346502239,IM
-1346502240,1346502319,GB
+1346501880,1346501883,GB
+1346501884,1346501887,IM
+1346501888,1346501891,GB
+1346501892,1346501895,IM
+1346501896,1346502223,GB
+1346502224,1346502263,IM
+1346502264,1346502319,GB
 1346502320,1346502323,IM
-1346502324,1346502399,GB
-1346502400,1346502527,IM
-1346502528,1346502655,GB
+1346502324,1346502655,GB
 1346502656,1346510847,DE
 1346510848,1346519039,AT
 1346519040,1346527231,RU
@@ -29201,6 +29935,7 @@
 1346928640,1346932735,DE
 1346932736,1346936831,DK
 1346936832,1346940927,IT
+1346940928,1346945023,KG
 1346945024,1346949119,PL
 1346949120,1346957311,RU
 1346957312,1346961407,DE
@@ -29351,148 +30086,74 @@
 1347293184,1347293311,SE
 1347293312,1347293319,LR
 1347293320,1347293327,GA
-1347293328,1347293335,NG
-1347293336,1347293339,A2
-1347293340,1347293343,SO
-1347293344,1347293351,A2
-1347293352,1347293391,NG
-1347293392,1347293399,CY
-1347293400,1347293407,IQ
-1347293408,1347293415,NG
-1347293416,1347293423,A2
+1347293328,1347293351,A2
+1347293352,1347293359,NG
+1347293360,1347293423,A2
 1347293424,1347293431,GN
-1347293432,1347293439,NG
-1347293440,1347293447,A2
+1347293432,1347293447,A2
 1347293448,1347293455,GB
-1347293456,1347293463,NG
-1347293464,1347293471,A2
-1347293472,1347293479,IQ
+1347293456,1347293479,A2
 1347293480,1347293487,LR
-1347293488,1347293495,TD
-1347293496,1347293503,GH
-1347293504,1347293511,US
+1347293488,1347293511,A2
 1347293512,1347293519,GN
 1347293520,1347293527,PS
 1347293528,1347293535,NG
 1347293536,1347293543,GH
-1347293544,1347293551,US
-1347293552,1347293559,A2
+1347293544,1347293559,A2
 1347293560,1347293567,GN
-1347293568,1347293575,GH
-1347293576,1347293583,IQ
-1347293584,1347293591,AF
-1347293592,1347293599,A2
+1347293568,1347293599,A2
 1347293600,1347293607,NG
 1347293608,1347293615,A2
-1347293616,1347293639,US
-1347293640,1347293647,IQ
-1347293648,1347293655,US
-1347293656,1347293675,GN
-1347293676,1347293679,BH
-1347293680,1347293687,GN
-1347293688,1347293723,NG
-1347293724,1347293727,IQ
-1347293728,1347293735,A2
-1347293736,1347293759,GN
-1347293760,1347293767,US
-1347293768,1347293775,CM
-1347293776,1347293799,NG
-1347293800,1347293807,IQ
+1347293616,1347293623,US
+1347293624,1347293631,A2
+1347293632,1347293639,US
+1347293640,1347293655,A2
+1347293656,1347293671,GN
+1347293672,1347293687,A2
+1347293688,1347293711,NG
+1347293712,1347293743,A2
+1347293744,1347293751,GN
+1347293752,1347293759,A2
+1347293760,1347293767,ZM
+1347293768,1347293791,A2
+1347293792,1347293799,NG
+1347293800,1347293807,A2
 1347293808,1347293815,NG
-1347293816,1347293823,SO
-1347293824,1347293831,CM
-1347293832,1347293839,NG
+1347293816,1347293839,A2
 1347293840,1347293847,CA
-1347293848,1347293855,BH
+1347293848,1347293855,A2
 1347293856,1347293863,GN
 1347293864,1347293871,GB
-1347293872,1347293879,A2
-1347293880,1347293887,NG
+1347293872,1347293887,A2
 1347293888,1347293903,GQ
-1347293904,1347293911,NG
-1347293912,1347293919,GA
+1347293904,1347293919,A2
 1347293920,1347293927,GB
 1347293928,1347293935,US
 1347293936,1347293943,NG
-1347293944,1347293951,A2
-1347293952,1347293975,NG
-1347293976,1347293983,GN
-1347293984,1347293991,US
+1347293944,1347293959,A2
+1347293960,1347293967,NG
+1347293968,1347293991,A2
 1347293992,1347293999,NG
-1347294000,1347294007,US
-1347294008,1347294015,A2
-1347294016,1347294023,US
-1347294024,1347294039,GN
-1347294040,1347294047,GB
-1347294048,1347294055,TH
-1347294056,1347294063,NG
-1347294064,1347294071,GH
-1347294072,1347294079,NG
-1347294080,1347294087,A2
+1347294000,1347294031,A2
+1347294032,1347294039,GN
+1347294040,1347294087,A2
 1347294088,1347294095,US
-1347294096,1347294111,CM
-1347294112,1347294119,GN
-1347294120,1347294127,A2
-1347294128,1347294135,NG
-1347294136,1347294143,LR
+1347294096,1347294143,A2
 1347294144,1347294151,NG
 1347294152,1347294159,GB
-1347294160,1347294167,CM
-1347294168,1347294175,GB
-1347294176,1347294183,NG
-1347294184,1347294191,A2
-1347294192,1347294199,GB
+1347294160,1347294199,A2
 1347294200,1347294207,NG
-1347294208,1347294215,A2
-1347294216,1347294223,IQ
-1347294224,1347294231,A2
-1347294232,1347294239,US
-1347294240,1347294271,A2
-1347294272,1347294279,BH
-1347294280,1347294287,BD
-1347294288,1347294303,UG
-1347294304,1347294311,US
-1347294312,1347294319,A2
-1347294320,1347294327,NG
-1347294328,1347294343,A2
-1347294344,1347294351,CM
-1347294352,1347294367,LR
-1347294368,1347294375,NG
-1347294376,1347294383,A2
-1347294384,1347294399,NG
-1347294400,1347294407,A2
-1347294408,1347294415,GN
-1347294416,1347294423,A2
+1347294208,1347294423,A2
 1347294424,1347294431,KW
-1347294432,1347294435,US
-1347294436,1347294439,A2
-1347294440,1347294447,SO
-1347294448,1347294975,US
-1347294976,1347294991,A2
-1347294992,1347295007,NG
-1347295008,1347295039,A2
-1347295040,1347295047,GB
-1347295048,1347295055,IQ
-1347295056,1347295063,AF
-1347295064,1347295071,A2
+1347294432,1347295071,A2
 1347295072,1347295079,US
 1347295080,1347295087,NG
-1347295088,1347295095,A2
-1347295096,1347295103,NG
-1347295104,1347295143,A2
-1347295144,1347295151,IQ
-1347295152,1347295159,US
-1347295160,1347295199,A2
-1347295200,1347295215,GB
-1347295216,1347295223,A2
-1347295224,1347295231,CH
-1347295232,1347295743,A2
-1347295744,1347295755,US
-1347295756,1347295759,A2
-1347295760,1347295775,US
+1347295088,1347295207,A2
+1347295208,1347295215,GB
+1347295216,1347295775,A2
 1347295776,1347295783,IQ
-1347295784,1347295999,A2
-1347296000,1347296015,US
+1347295784,1347296007,A2
+1347296008,1347296015,US
 1347296016,1347297279,A2
 1347297280,1347305471,UA
 1347305472,1347309567,AL
@@ -29731,7 +30392,9 @@
 1347855960,1347855967,DE
 1347855968,1347855999,EU
 1347856000,1347856063,DE
-1347856064,1347856095,EU
+1347856064,1347856079,EU
+1347856080,1347856087,DE
+1347856088,1347856095,EU
 1347856096,1347856239,DE
 1347856240,1347856255,EU
 1347856256,1347856383,DE
@@ -29820,8 +30483,8 @@
 1347978408,1347978447,A2
 1347978448,1347978463,NG
 1347978464,1347978575,A2
-1347978576,1347978623,NG
-1347978624,1347978631,A2
+1347978576,1347978591,NG
+1347978592,1347978631,A2
 1347978632,1347978647,NG
 1347978648,1347978727,A2
 1347978728,1347978735,NG
@@ -29876,25 +30539,17 @@
 1347982224,1347982231,NG
 1347982232,1347982279,A2
 1347982280,1347982287,NG
-1347982288,1347982911,A2
-1347982912,1347982919,NG
-1347982920,1347982927,A2
+1347982288,1347982927,A2
 1347982928,1347982943,NG
-1347982944,1347983039,A2
-1347983040,1347983047,NG
-1347983048,1347983063,A2
+1347982944,1347983063,A2
 1347983064,1347983071,NG
-1347983072,1347983103,A2
-1347983104,1347983119,NG
-1347983120,1347983247,A2
+1347983072,1347983247,A2
 1347983248,1347983263,DK
 1347983264,1347983303,A2
 1347983304,1347983311,NG
 1347983312,1347983423,A2
 1347983424,1347983487,NG
-1347983488,1347983567,A2
-1347983568,1347983575,NG
-1347983576,1347983903,A2
+1347983488,1347983903,A2
 1347983904,1347983911,NG
 1347983912,1347983919,A2
 1347983920,1347983927,NG
@@ -29904,9 +30559,7 @@
 1347984208,1347984215,NG
 1347984216,1347984415,A2
 1347984416,1347984423,NG
-1347984424,1347984647,A2
-1347984648,1347984655,NG
-1347984656,1347984719,A2
+1347984424,1347984719,A2
 1347984720,1347984735,NG
 1347984736,1347984879,A2
 1347984880,1347984895,NG
@@ -29914,8 +30567,8 @@
 1347984960,1347984991,NG
 1347984992,1347985031,A2
 1347985032,1347985039,NG
-1347985040,1347985095,A2
-1347985096,1347985119,NG
+1347985040,1347985103,A2
+1347985104,1347985119,NG
 1347985120,1347985151,A2
 1347985152,1347985407,DK
 1347985408,1347989503,IT
@@ -30246,26 +30899,18 @@
 1353274896,1353274911,GB
 1353274912,1353275007,ES
 1353275008,1353275015,GB
-1353275016,1353275111,ES
-1353275112,1353275119,GB
-1353275120,1353275391,ES
+1353275016,1353275391,ES
 1353275392,1353277439,GB
 1353277440,1353279487,CH
 1353279488,1353279743,IT
 1353279744,1353279751,GB
 1353279752,1353279759,IT
 1353279760,1353279763,GB
-1353279764,1353280079,IT
-1353280080,1353280087,GB
-1353280088,1353280119,IT
+1353279764,1353280119,IT
 1353280120,1353280127,GB
 1353280128,1353280143,IT
 1353280144,1353280151,GB
-1353280152,1353280279,IT
-1353280280,1353280287,GB
-1353280288,1353280567,IT
-1353280568,1353280575,GB
-1353280576,1353280663,IT
+1353280152,1353280663,IT
 1353280664,1353280671,GB
 1353280672,1353281023,IT
 1353281024,1353281535,BE
@@ -30363,13 +31008,15 @@
 1353307144,1353308159,GB
 1353308160,1353309183,FR
 1353309184,1353310463,GB
-1353310464,1353310599,ES
+1353310464,1353310479,ES
+1353310480,1353310487,GB
+1353310488,1353310599,ES
 1353310600,1353310607,DE
 1353310608,1353310719,ES
 1353310720,1353311175,IT
 1353311176,1353311183,ES
-1353311184,1353311199,IT
-1353311200,1353311215,GB
+1353311184,1353311214,IT
+1353311215,1353311215,GB
 1353311216,1353311231,IT
 1353311232,1353312255,GB
 1353312256,1353312767,CH
@@ -30440,9 +31087,7 @@
 1354662152,1354662463,DE
 1354662464,1354662527,AT
 1354662528,1354662591,ES
-1354662592,1354663807,DE
-1354663808,1354663808,AT
-1354663809,1354664743,DE
+1354662592,1354664743,DE
 1354664744,1354664751,IT
 1354664752,1354664759,DE
 1354664760,1354664767,IT
@@ -30524,9 +31169,7 @@
 1354687400,1354687407,IT
 1354687408,1354687455,DE
 1354687456,1354687487,IT
-1354687488,1354687759,DE
-1354687760,1354687763,CH
-1354687764,1354694655,DE
+1354687488,1354694655,DE
 1354694656,1354760191,IR
 1354760192,1355022335,GB
 1355022336,1355284479,DK
@@ -30772,10 +31415,11 @@
 1357883904,1357883999,EU
 1357884000,1357884031,FR
 1357884032,1357884095,RU
-1357884096,1357884159,EU
-1357884160,1357884423,FR
+1357884096,1357884415,EU
+1357884416,1357884423,FR
 1357884424,1357884427,BE
-1357884428,1357884439,EU
+1357884428,1357884431,EU
+1357884432,1357884439,US
 1357884440,1357884447,FR
 1357884448,1357884511,EU
 1357884512,1357884935,FR
@@ -30804,20 +31448,21 @@
 1357890944,1357891327,NL
 1357891328,1357891391,EU
 1357891392,1357891399,NL
-1357891400,1357891423,EU
-1357891424,1357891455,NL
+1357891400,1357891455,EU
 1357891456,1357891583,SE
 1357891584,1357891647,EU
 1357891648,1357891679,NL
 1357891680,1357891711,GB
-1357891712,1357891839,NL
+1357891712,1357891839,EU
 1357891840,1357892095,GB
-1357892096,1357892351,EU
+1357892096,1357892223,IE
+1357892224,1357892351,EU
 1357892352,1357893119,NL
 1357893120,1357893375,SE
 1357893376,1357893407,EU
 1357893408,1357893439,SE
-1357893440,1357893503,EU
+1357893440,1357893471,IT
+1357893472,1357893503,PL
 1357893504,1357893631,DE
 1357893632,1357897855,EU
 1357897856,1357898495,DE
@@ -30870,7 +31515,9 @@
 1357975552,1357979647,AT
 1357979648,1357983743,KZ
 1357983744,1357987839,RU
-1357987840,1357988495,GB
+1357987840,1357988479,GB
+1357988480,1357988483,DE
+1357988484,1357988495,GB
 1357988496,1357988543,DE
 1357988544,1357988551,NL
 1357988552,1357988559,DE
@@ -31295,7 +31942,9 @@
 1358739136,1358739151,NL
 1358739152,1358739503,SE
 1358739504,1358739519,FR
-1358739520,1358740159,SE
+1358739520,1358740099,SE
+1358740100,1358740103,MY
+1358740104,1358740159,SE
 1358740160,1358740175,FR
 1358740176,1358740335,SE
 1358740336,1358740351,GB
@@ -31587,8 +32236,8 @@
 1359468656,1359468671,JP
 1359468672,1359468695,SG
 1359468696,1359468711,DE
-1359468712,1359468743,SG
-1359468744,1359468863,DE
+1359468712,1359468751,SG
+1359468752,1359468863,DE
 1359468864,1359468879,SG
 1359468880,1359468927,DE
 1359468928,1359469055,SG
@@ -31728,7 +32377,9 @@
 1360265216,1360269311,GB
 1360269312,1360273407,KG
 1360273408,1360281599,GB
-1360281600,1360285695,NL
+1360281600,1360282751,NL
+1360282752,1360282783,GB
+1360282784,1360285695,NL
 1360285696,1360289791,DE
 1360289792,1360293887,RU
 1360293888,1360302079,DE
@@ -31746,6 +32397,7 @@
 1360322560,1360326655,FI
 1360326656,1360330751,PT
 1360330752,1360334847,UA
+1360334848,1360338943,IT
 1360338944,1360343039,CY
 1360343040,1360347135,SA
 1360347136,1360351231,GB
@@ -31904,25 +32556,22 @@
 1360892496,1360892502,GB
 1360892503,1360892671,CH
 1360892672,1360892703,IT
-1360892704,1360892735,CH
-1360892736,1360892739,EE
-1360892740,1360892743,GB
-1360892744,1360892763,CH
-1360892764,1360892771,IT
-1360892772,1360892791,CH
-1360892792,1360892799,IT
+1360892704,1360892763,CH
+1360892764,1360892767,IT
+1360892768,1360892795,CH
+1360892796,1360892799,IT
 1360892800,1360892807,CH
 1360892808,1360892823,IT
 1360892824,1360892927,CH
 1360892928,1360893055,IT
 1360893056,1360893191,CH
-1360893192,1360893195,IT
-1360893196,1360893831,CH
-1360893832,1360893835,IT
-1360893836,1360893951,CH
-1360893952,1360894207,IT
-1360894208,1360894975,CH
-1360894976,1360895007,IT
+1360893192,1360893199,IT
+1360893200,1360894079,CH
+1360894080,1360894151,IT
+1360894152,1360894975,CH
+1360894976,1360894983,IT
+1360894984,1360894991,CH
+1360894992,1360895007,IT
 1360895008,1360895751,CH
 1360895752,1360895755,IT
 1360895756,1360895999,CH
@@ -32022,7 +32671,9 @@
 1361035680,1361035683,IE
 1361035684,1361035687,IQ
 1361035688,1361035691,GB
-1361035692,1361035715,IQ
+1361035692,1361035695,IQ
+1361035696,1361035703,NL
+1361035704,1361035715,IQ
 1361035716,1361035723,GB
 1361035724,1361035727,IQ
 1361035728,1361035735,NL
@@ -32444,7 +33095,9 @@
 1364803584,1364811775,RU
 1364811776,1364815871,DE
 1364815872,1364819967,RU
-1364819968,1364824063,GB
+1364819968,1364823295,GB
+1364823296,1364823311,AE
+1364823312,1364824063,GB
 1364824064,1364828159,SE
 1364828160,1364829439,GB
 1364829440,1364829487,FR
@@ -32627,7 +33280,9 @@
 1365110784,1365114879,FR
 1365114880,1365118975,BA
 1365118976,1365127167,RU
-1365127168,1365130271,AT
+1365127168,1365127427,AT
+1365127428,1365127431,TR
+1365127432,1365130271,AT
 1365130272,1365130303,IT
 1365130304,1365130495,AT
 1365130496,1365131007,IT
@@ -32667,11 +33322,13 @@
 1365217712,1365217791,GB
 1365217792,1365217807,BD
 1365217808,1365217815,US
-1365217816,1365217831,GB
+1365217816,1365217823,DK
+1365217824,1365217831,GB
 1365217832,1365217839,TR
 1365217840,1365217879,GB
 1365217880,1365217919,US
-1365217920,1365217975,GB
+1365217920,1365217927,DK
+1365217928,1365217975,GB
 1365217976,1365218031,US
 1365218032,1365218039,CA
 1365218040,1365218047,GB
@@ -32875,9 +33532,7 @@
 1369964544,1369997311,GB
 1369997312,1370030079,PL
 1370030080,1370062847,BE
-1370062848,1370081279,DE
-1370081280,1370091519,EU
-1370091520,1370095615,DE
+1370062848,1370095615,DE
 1370095616,1370128383,GB
 1370128384,1370161151,SE
 1370161152,1370187775,NL
@@ -33298,7 +33953,11 @@
 1382218912,1382218959,NL
 1382218960,1382218991,GB
 1382218992,1382219775,NL
-1382219776,1382223327,SE
+1382219776,1382221615,SE
+1382221616,1382221623,FI
+1382221624,1382221655,SE
+1382221656,1382221659,FI
+1382221660,1382223327,SE
 1382223328,1382223359,FI
 1382223360,1382223551,SE
 1382223552,1382223615,NO
@@ -33354,8 +34013,7 @@
 1383073280,1383073535,KZ
 1383073536,1383088127,RU
 1383088128,1383096319,IS
-1383096320,1383096383,PL
-1383096384,1383096447,GB
+1383096320,1383096447,PL
 1383096448,1383096575,FR
 1383096576,1383096831,GB
 1383096832,1383096863,FR
@@ -33365,8 +34023,10 @@
 1383098112,1383098367,DE
 1383098368,1383099391,GB
 1383099392,1383099903,DE
-1383099904,1383099967,FR
-1383099968,1383100159,GB
+1383099904,1383099983,FR
+1383099984,1383099999,GB
+1383100000,1383100095,FR
+1383100096,1383100159,GB
 1383100160,1383100415,FR
 1383100416,1383100831,GB
 1383100832,1383100847,IE
@@ -33375,14 +34035,16 @@
 1383100896,1383103271,GB
 1383103272,1383103279,ES
 1383103280,1383103471,GB
-1383103472,1383103487,NL
+1383103472,1383103487,AE
 1383103488,1383104015,GB
 1383104016,1383104023,ES
 1383104024,1383104255,GB
 1383104256,1383104511,FR
 1383104512,1383112703,JE
 1383112704,1383120895,GE
-1383120896,1383129031,IT
+1383120896,1383122943,IT
+1383122944,1383122951,GB
+1383122952,1383129031,IT
 1383129032,1383129039,ES
 1383129040,1383129087,IT
 1383129088,1383137279,GB
@@ -33502,30 +34164,12 @@
 1383563264,1383571455,RU
 1383571456,1383579647,DE
 1383579648,1383587839,IT
-1383587840,1383588415,SK
-1383588416,1383588423,CZ
-1383588424,1383588431,SK
-1383588432,1383588439,CZ
-1383588440,1383589375,SK
-1383589376,1383590143,CZ
-1383590144,1383590287,SK
-1383590288,1383590295,CZ
-1383590296,1383590367,SK
-1383590368,1383590375,CZ
-1383590376,1383590463,SK
-1383590464,1383590543,CZ
-1383590544,1383590591,SK
-1383590592,1383590655,CZ
-1383590656,1383590911,SK
-1383590912,1383591167,CZ
-1383591168,1383591935,SK
+1383587840,1383591935,SK
 1383591936,1383596031,CZ
 1383596032,1384120319,FR
 1384120320,1384153087,NG
 1384153088,1384185855,FI
-1384185856,1384187967,DE
-1384187968,1384188031,CH
-1384188032,1384189055,DE
+1384185856,1384189055,DE
 1384189056,1384189183,CH
 1384189184,1384189439,AT
 1384189440,1384190463,DE
@@ -33723,6 +34367,8 @@
 1385259008,1385267199,IT
 1385267200,1385275391,SE
 1385275392,1385283583,IT
+1385283584,1385286143,DE
+1385286144,1385287679,GB
 1385287680,1385289727,IS
 1385289728,1385291775,NO
 1385291776,1385299967,TR
@@ -33887,9 +34533,7 @@
 1388380160,1388388895,IT
 1388388896,1388388927,NG
 1388388928,1388388943,IT
-1388388944,1388388959,NG
-1388388960,1388388967,IT
-1388388968,1388388991,NG
+1388388944,1388388991,NG
 1388388992,1388389447,IT
 1388389448,1388389455,NG
 1388389456,1388389567,IT
@@ -33898,9 +34542,7 @@
 1388389928,1388390015,NG
 1388390016,1388390143,IT
 1388390144,1388394495,NG
-1388394496,1388395519,IT
-1388395520,1388396287,NG
-1388396288,1388396543,IT
+1388394496,1388396543,IT
 1388396544,1388404735,LV
 1388404736,1388412927,UA
 1388412928,1388421119,RU
@@ -34077,8 +34719,8 @@
 1388742732,1388742735,IR
 1388742736,1388743043,IE
 1388743044,1388743055,GB
-1388743056,1388743439,IE
-1388743440,1388743451,GB
+1388743056,1388743443,IE
+1388743444,1388743451,GB
 1388743452,1388743919,IE
 1388743920,1388743935,GB
 1388743936,1388744087,IE
@@ -34104,8 +34746,8 @@
 1388745728,1388745911,IE
 1388745912,1388745919,GB
 1388745920,1388745927,IE
-1388745928,1388745935,GB
-1388745936,1388746155,IE
+1388745928,1388745931,GB
+1388745932,1388746155,IE
 1388746156,1388746159,GB
 1388746160,1388746175,IE
 1388746176,1388746239,GB
@@ -34155,7 +34797,9 @@
 1388797952,1388806143,RU
 1388806144,1388807679,DE
 1388807680,1388807711,BZ
-1388807712,1388814335,DE
+1388807712,1388808255,DE
+1388808256,1388808283,BZ
+1388808284,1388814335,DE
 1388814336,1388815103,AX
 1388815104,1388815231,FI
 1388815232,1388818687,AX
@@ -34215,7 +34859,8 @@
 1389207040,1389207295,LB
 1389207296,1389207359,A2
 1389207360,1389207391,SA
-1389207392,1389207487,IR
+1389207392,1389207423,IR
+1389207424,1389207487,DE
 1389207488,1389207519,A2
 1389207520,1389207551,IR
 1389207552,1389209087,A2
@@ -34392,7 +35037,8 @@
 1389265576,1389265591,SC
 1389265592,1389265598,CG
 1389265599,1389265599,A2
-1389265600,1389265663,SO
+1389265600,1389265639,US
+1389265640,1389265663,SO
 1389265664,1389265791,ZA
 1389265792,1389265807,A2
 1389265808,1389265823,CA
@@ -34593,7 +35239,8 @@
 1389707264,1389723647,IT
 1389723648,1389756415,ES
 1389756416,1389772799,SE
-1389772800,1389780991,SI
+1389772800,1389779967,SI
+1389779968,1389780991,RS
 1389780992,1389782527,HR
 1389782528,1389782543,SI
 1389782544,1389782559,HR
@@ -34926,7 +35573,8 @@
 1401745920,1401745935,IT
 1401745936,1401745959,SE
 1401745960,1401745967,US
-1401745968,1401745983,SE
+1401745968,1401745971,MY
+1401745972,1401745983,SE
 1401745984,1401745999,NL
 1401746000,1401746015,ES
 1401746016,1401746019,GB
@@ -34938,7 +35586,9 @@
 1401746240,1401746255,NL
 1401746256,1401746271,ES
 1401746272,1401746279,GB
-1401746280,1401746431,SE
+1401746280,1401746283,SE
+1401746284,1401746287,US
+1401746288,1401746431,SE
 1401746432,1401746447,NL
 1401746448,1401746467,SE
 1401746468,1401746471,NL
@@ -34987,7 +35637,10 @@
 1401759232,1401759487,GB
 1401759488,1401760255,DE
 1401760256,1401760767,SK
-1401760768,1401765887,DE
+1401760768,1401765247,DE
+1401765248,1401765375,NL
+1401765376,1401765759,DE
+1401765760,1401765887,NL
 1401765888,1401782271,IE
 1401782272,1401815039,FR
 1401815040,1401817087,SE
@@ -35230,10 +35883,14 @@
 1403994112,1404010495,AT
 1404010496,1404026879,PL
 1404026880,1404043263,ES
-1404043264,1404076031,SE
+1404043264,1404045311,EE
+1404045312,1404059647,SE
+1404059648,1404076031,NO
 1404076032,1404084223,DE
 1404084224,1404092415,NO
-1404092416,1404184063,SE
+1404092416,1404116991,SE
+1404116992,1404125183,NO
+1404125184,1404184063,SE
 1404184064,1404184575,NO
 1404184576,1404186623,SE
 1404186624,1404187647,NO
@@ -35278,15 +35935,19 @@
 1404387328,1404395519,DE
 1404395520,1404403711,SE
 1404403712,1404411903,NL
-1404411904,1404645375,SE
+1404411904,1404575743,SE
+1404575744,1404583935,HR
+1404583936,1404645375,SE
 1404645376,1404645887,HR
 1404645888,1404764159,SE
 1404764160,1404768511,NL
 1404768512,1404768767,SE
 1404768768,1404769279,NL
 1404769280,1404770303,SE
-1404770304,1404772351,NL
-1404772352,1404802047,SE
+1404770304,1404780543,NL
+1404780544,1404796927,SE
+1404796928,1404801023,EE
+1404801024,1404802047,SE
 1404802048,1404803071,EE
 1404803072,1404804095,LV
 1404804096,1404805119,SE
@@ -35299,7 +35960,8 @@
 1404875776,1404876799,LT
 1404876800,1404895231,SE
 1404895232,1404927999,DE
-1404928000,1404952575,SE
+1404928000,1404944383,SE
+1404944384,1404952575,DE
 1404952576,1404960767,NL
 1404960768,1405050879,SE
 1405050880,1405059071,AT
@@ -35380,6 +36042,7 @@
 1406763008,1406771199,BE
 1406771200,1406779391,GB
 1406779392,1406787583,RU
+1406787584,1406795775,ES
 1406795776,1406803967,GB
 1406803968,1406812159,DE
 1406812160,1406820351,SE
@@ -35425,9 +36088,7 @@
 1407049728,1407057919,DE
 1407057920,1407066111,RU
 1407066112,1407074303,LU
-1407074304,1407082623,RU
-1407082624,1407082639,DE
-1407082640,1407089663,RU
+1407074304,1407089663,RU
 1407089664,1407090687,US
 1407090688,1407098879,CH
 1407098880,1407107071,BG
@@ -35436,9 +36097,13 @@
 1407123456,1407131647,SE
 1407131648,1407139839,NL
 1407139840,1407148031,DE
-1407148032,1407152903,GB
+1407148032,1407152263,GB
+1407152264,1407152287,US
+1407152288,1407152903,GB
 1407152904,1407152927,NL
-1407152928,1407156223,GB
+1407152928,1407154711,GB
+1407154712,1407154719,SE
+1407154720,1407156223,GB
 1407156224,1407164415,LV
 1407164416,1407172607,PT
 1407172608,1407180799,GB
@@ -35462,9 +36127,7 @@
 1407516784,1407516791,NG
 1407516792,1407516807,A2
 1407516808,1407516815,NG
-1407516816,1407516831,A2
-1407516832,1407516839,NG
-1407516840,1407516847,A2
+1407516816,1407516847,A2
 1407516848,1407516855,NG
 1407516856,1407516863,A2
 1407516864,1407516871,NG
@@ -35499,8 +36162,7 @@
 1407518160,1407518167,NG
 1407518168,1407518175,CD
 1407518176,1407518183,A2
-1407518184,1407518191,NG
-1407518192,1407518199,A2
+1407518184,1407518199,NG
 1407518200,1407518207,AE
 1407518208,1407518215,ZW
 1407518216,1407518239,A2
@@ -35515,7 +36177,9 @@
 1407518360,1407518367,NG
 1407518368,1407518375,ZA
 1407518376,1407518383,CD
-1407518384,1407518783,A2
+1407518384,1407518391,A2
+1407518392,1407518399,CD
+1407518400,1407518783,A2
 1407518784,1407518815,CD
 1407518816,1407518831,A2
 1407518832,1407518847,NG
@@ -35552,16 +36216,20 @@
 1407519224,1407519231,A2
 1407519232,1407519615,NG
 1407519616,1407519751,A2
-1407519752,1407519767,NG
+1407519752,1407519759,NG
+1407519760,1407519767,CD
 1407519768,1407519775,GN
 1407519776,1407519783,A2
-1407519784,1407519823,NG
+1407519784,1407519799,NG
+1407519800,1407519807,A2
+1407519808,1407519823,NG
 1407519824,1407519831,A2
 1407519832,1407519839,SD
-1407519840,1407519855,NG
+1407519840,1407519847,A2
+1407519848,1407519855,NG
 1407519856,1407519863,GN
 1407519864,1407519871,NG
-1407519872,1407519879,A2
+1407519872,1407519879,IL
 1407519880,1407519895,NG
 1407519896,1407519903,GN
 1407519904,1407519911,NG
@@ -35594,11 +36262,10 @@
 1407520208,1407520215,NG
 1407520216,1407520223,NE
 1407520224,1407520231,SD
-1407520232,1407520239,NG
-1407520240,1407520271,A2
+1407520232,1407520271,A2
 1407520272,1407520279,NG
-1407520280,1407520303,A2
-1407520304,1407520327,NG
+1407520280,1407520311,A2
+1407520312,1407520327,NG
 1407520328,1407520335,SL
 1407520336,1407520351,A2
 1407520352,1407520359,NG
@@ -35638,7 +36305,8 @@
 1407520768,1407520775,ZW
 1407520776,1407520783,CD
 1407520784,1407520791,SD
-1407520792,1407520807,A2
+1407520792,1407520799,ZA
+1407520800,1407520807,A2
 1407520808,1407520815,CI
 1407520816,1407520823,GQ
 1407520824,1407520831,CI
@@ -35667,8 +36335,7 @@
 1407521032,1407521047,A2
 1407521048,1407521055,NG
 1407521056,1407521063,KE
-1407521064,1407521071,A2
-1407521072,1407521079,NG
+1407521064,1407521079,NG
 1407521080,1407521087,UG
 1407521088,1407521095,NG
 1407521096,1407521103,A2
@@ -35692,12 +36359,18 @@
 1407521248,1407521279,GH
 1407521280,1407521415,A2
 1407521416,1407521423,LR
-1407521424,1407522319,A2
+1407521424,1407521543,A2
+1407521544,1407521567,NG
+1407521568,1407521575,A2
+1407521576,1407521591,NG
+1407521592,1407521599,A2
+1407521600,1407521709,NG
+1407521710,1407522319,A2
 1407522320,1407522327,TG
-1407522328,1407522335,NG
+1407522328,1407522335,A2
 1407522336,1407522351,SO
-1407522352,1407522359,CD
-1407522360,1407522367,NG
+1407522352,1407522359,A2
+1407522360,1407522367,FR
 1407522368,1407522383,GQ
 1407522384,1407522391,A2
 1407522392,1407522407,NG
@@ -35709,10 +36382,11 @@
 1407522441,1407522447,A2
 1407522448,1407522455,UG
 1407522456,1407522463,ML
-1407522464,1407522479,NG
+1407522464,1407522471,A2
+1407522472,1407522479,LR
 1407522480,1407522487,TZ
 1407522488,1407522495,ZW
-1407522496,1407522503,NG
+1407522496,1407522503,LR
 1407522504,1407522527,A2
 1407522528,1407522535,ZM
 1407522536,1407522551,NG
@@ -35736,20 +36410,28 @@
 1407522712,1407522719,BJ
 1407522720,1407522727,A2
 1407522728,1407522735,ZW
-1407522736,1407522751,NG
+1407522736,1407522743,A2
+1407522744,1407522751,NG
 1407522752,1407522767,ZM
 1407522768,1407522775,A2
 1407522776,1407522791,NG
 1407522792,1407522799,A2
 1407522800,1407522807,ZM
 1407522808,1407522815,NG
-1407522816,1407522831,A2
-1407522832,1407522839,IQ
+1407522816,1407522823,CD
+1407522824,1407522831,NG
+1407522832,1407522839,MZ
 1407522840,1407522871,A2
 1407522872,1407522879,IQ
-1407522880,1407522991,A2
+1407522880,1407522903,A2
+1407522904,1407522911,KE
+1407522912,1407522919,CG
+1407522920,1407522991,A2
 1407522992,1407522999,CD
-1407523000,1407523071,A2
+1407523000,1407523007,A2
+1407523008,1407523015,NG
+1407523016,1407523023,KE
+1407523024,1407523071,A2
 1407523072,1407523088,NG
 1407523089,1407523095,A2
 1407523096,1407523103,NG
@@ -35761,12 +36443,18 @@
 1407523144,1407523159,A2
 1407523160,1407523167,LR
 1407523168,1407523183,UG
-1407523184,1407523215,NG
+1407523184,1407523191,NG
+1407523192,1407523199,A2
+1407523200,1407523207,NG
+1407523208,1407523215,A2
 1407523216,1407523223,BI
 1407523224,1407523247,AO
-1407523248,1407523279,NG
+1407523248,1407523263,A2
+1407523264,1407523279,NG
 1407523280,1407523287,MZ
-1407523288,1407523311,NG
+1407523288,1407523295,NG
+1407523296,1407523303,A2
+1407523304,1407523311,NG
 1407523312,1407523327,BJ
 1407523328,1407523335,MW
 1407523336,1407523351,A2
@@ -35805,17 +36493,17 @@
 1407524840,1407524847,LR
 1407524848,1407524855,A2
 1407524856,1407524863,CD
-1407524864,1407524879,A2
-1407524880,1407524887,NG
-1407524888,1407524895,A2
+1407524864,1407524895,A2
 1407524896,1407524903,LR
-1407524904,1407524927,NG
-1407524928,1407524935,A2
-1407524936,1407524951,NG
+1407524904,1407524911,NG
+1407524912,1407524935,A2
+1407524936,1407524943,GR
+1407524944,1407524951,A2
 1407524952,1407524959,CM
 1407524960,1407524967,TZ
 1407524968,1407524975,NG
-1407524976,1407524991,A2
+1407524976,1407524983,A2
+1407524984,1407524991,ZA
 1407524992,1407524999,TZ
 1407525000,1407525007,A2
 1407525008,1407525015,TZ
@@ -35824,11 +36512,12 @@
 1407525032,1407525039,A2
 1407525040,1407525047,ZA
 1407525048,1407525055,NG
-1407525056,1407525063,A2
+1407525056,1407525063,ZA
 1407525064,1407525079,NG
 1407525080,1407525087,A2
 1407525088,1407525095,MW
-1407525096,1407525111,NG
+1407525096,1407525103,A2
+1407525104,1407525111,NG
 1407525112,1407525119,ZA
 1407525120,1407525127,NG
 1407525128,1407525135,SD
@@ -35842,29 +36531,33 @@
 1407525208,1407525215,CD
 1407525216,1407525231,A2
 1407525232,1407525255,CD
-1407525256,1407525263,NG
+1407525256,1407525263,A2
 1407525264,1407525287,CD
 1407525288,1407525303,A2
 1407525304,1407525319,CD
 1407525320,1407525327,A2
 1407525328,1407525343,CD
-1407525344,1407525471,A2
+1407525344,1407525383,A2
+1407525384,1407525391,CD
+1407525392,1407525399,A2
+1407525400,1407525407,KE
+1407525408,1407525471,A2
 1407525472,1407525479,UG
-1407525480,1407526711,A2
+1407525480,1407525543,A2
+1407525544,1407525551,KE
+1407525552,1407525583,A2
+1407525584,1407525591,GL
+1407525592,1407526711,A2
 1407526712,1407526719,GN
 1407526720,1407529023,A2
 1407529024,1407529087,NG
-1407529088,1407529095,A2
-1407529096,1407529103,ZW
+1407529088,1407529103,A2
 1407529104,1407529111,NG
-1407529112,1407529127,A2
-1407529128,1407529135,ZW
-1407529136,1407529143,A2
+1407529112,1407529143,A2
 1407529144,1407529151,ZW
 1407529152,1407529183,A2
 1407529184,1407529191,NG
-1407529192,1407529199,A2
-1407529200,1407529207,IQ
+1407529192,1407529207,A2
 1407529208,1407529215,NG
 1407529216,1407531007,A2
 1407531008,1407531519,NG
@@ -35872,7 +36565,7 @@
 1407531552,1407531559,SD
 1407531560,1407531567,NG
 1407531568,1407531575,CD
-1407531576,1407531583,UG
+1407531576,1407531583,A2
 1407531584,1407531591,CD
 1407531592,1407531599,A2
 1407531600,1407531607,NG
@@ -35962,7 +36655,8 @@
 1407535624,1407535631,IQ
 1407535632,1407535639,SD
 1407535640,1407535647,A2
-1407535648,1407535663,NG
+1407535648,1407535655,NG
+1407535656,1407535663,GB
 1407535664,1407535671,A2
 1407535672,1407535679,SD
 1407535680,1407535687,GN
@@ -35977,7 +36671,9 @@
 1407535824,1407535831,A2
 1407535832,1407535839,GB
 1407535840,1407535847,NG
-1407535848,1407536127,A2
+1407535848,1407535855,A2
+1407535856,1407535863,NG
+1407535864,1407536127,A2
 1407536128,1407536639,GA
 1407536640,1407536895,CD
 1407536896,1407536903,A2
@@ -36002,17 +36698,18 @@
 1407537136,1407537143,NG
 1407537144,1407537183,A2
 1407537184,1407537191,NG
-1407537192,1407537199,A2
-1407537200,1407537207,NG
+1407537192,1407537207,A2
 1407537208,1407537215,BE
 1407537216,1407537231,A2
 1407537232,1407537255,NG
 1407537256,1407537263,A2
-1407537264,1407537279,NG
-1407537280,1407537287,A2
+1407537264,1407537271,NG
+1407537272,1407537287,A2
 1407537288,1407537295,NG
 1407537296,1407537303,UG
-1407537304,1407537335,A2
+1407537304,1407537319,A2
+1407537320,1407537327,NG
+1407537328,1407537335,A2
 1407537336,1407537351,NG
 1407537352,1407537367,A2
 1407537368,1407537383,NG
@@ -36026,11 +36723,9 @@
 1407537464,1407537479,A2
 1407537480,1407537487,CM
 1407537488,1407537495,GH
-1407537496,1407537503,A2
-1407537504,1407537511,NG
+1407537496,1407537511,A2
 1407537512,1407537519,LR
-1407537520,1407537535,A2
-1407537536,1407537543,LR
+1407537520,1407537543,A2
 1407537544,1407537551,AO
 1407537552,1407537559,A2
 1407537560,1407537567,NG
@@ -36134,9 +36829,14 @@
 1407539152,1407539167,A2
 1407539168,1407539175,TD
 1407539176,1407539183,GH
-1407539184,1407539199,NG
+1407539184,1407539191,A2
+1407539192,1407539199,NG
 1407539200,1407539455,GE
-1407539456,1407539967,A2
+1407539456,1407539751,A2
+1407539752,1407539759,NG
+1407539760,1407539831,A2
+1407539832,1407539839,NG
+1407539840,1407539967,A2
 1407539968,1407539975,CD
 1407539976,1407540007,A2
 1407540008,1407540015,NG
@@ -36146,13 +36846,13 @@
 1407540072,1407540079,NG
 1407540080,1407540111,A2
 1407540112,1407540119,TG
-1407540120,1407540127,NG
-1407540128,1407540135,A2
+1407540120,1407540135,A2
 1407540136,1407540143,NG
 1407540144,1407540159,A2
 1407540160,1407540167,CD
 1407540168,1407540183,A2
-1407540184,1407540199,NG
+1407540184,1407540191,NG
+1407540192,1407540199,A2
 1407540200,1407540215,CD
 1407540216,1407541471,A2
 1407541472,1407541495,NG
@@ -36173,8 +36873,7 @@
 1407542544,1407542551,LR
 1407542552,1407542575,A2
 1407542576,1407542583,CD
-1407542584,1407542591,A2
-1407542592,1407542599,NG
+1407542584,1407542599,A2
 1407542600,1407542607,TG
 1407542608,1407542623,A2
 1407542624,1407542631,BJ
@@ -36225,9 +36924,7 @@
 1407547256,1407547263,A2
 1407547264,1407547271,SL
 1407547272,1407547279,NG
-1407547280,1407547287,A2
-1407547288,1407547295,NG
-1407547296,1407547303,A2
+1407547280,1407547303,A2
 1407547304,1407547311,SL
 1407547312,1407547327,NG
 1407547328,1407547335,A2
@@ -36277,9 +36974,7 @@
 1407702272,1407702783,GB
 1407702784,1407702911,FR
 1407702912,1407703039,GB
-1407703040,1407703407,FR
-1407703408,1407703415,GB
-1407703416,1407703455,FR
+1407703040,1407703455,FR
 1407703456,1407703535,GB
 1407703536,1407703871,FR
 1407703872,1407703935,GB
@@ -36596,7 +37291,9 @@
 1410221664,1410221671,GB
 1410221672,1410234839,FR
 1410234840,1410234847,A2
-1410234848,1410250551,FR
+1410234848,1410244863,FR
+1410244864,1410244871,GB
+1410244872,1410250551,FR
 1410250552,1410250559,GB
 1410250560,1410261007,FR
 1410261008,1410261015,GB
@@ -36604,7 +37301,9 @@
 1410261664,1410261671,GB
 1410261672,1410262799,FR
 1410262800,1410262815,DE
-1410262816,1410267039,FR
+1410262816,1410266303,FR
+1410266304,1410266311,IE
+1410266312,1410267039,FR
 1410267040,1410267055,ES
 1410267056,1410267071,GB
 1410267072,1410267087,IT
@@ -36746,8 +37445,11 @@
 1410752828,1410753023,DE
 1410753024,1410753031,AQ
 1410753032,1410753055,BS
-1410753056,1410753151,AQ
-1410753152,1410753303,DE
+1410753056,1410753143,AQ
+1410753144,1410753151,SC
+1410753152,1410753159,DE
+1410753160,1410753167,AQ
+1410753168,1410753303,DE
 1410753304,1410753327,AQ
 1410753328,1410753335,DE
 1410753336,1410753343,AQ
@@ -36907,9 +37609,11 @@
 1412000864,1412000879,BA
 1412000880,1412000903,SI
 1412000904,1412000911,BA
-1412000912,1412001023,SI
-1412001024,1412001279,BA
-1412001280,1412001311,SI
+1412000912,1412000943,SI
+1412000944,1412000951,BA
+1412000952,1412000959,SI
+1412000960,1412000975,BA
+1412000976,1412001311,SI
 1412001312,1412001319,DE
 1412001320,1412001807,SI
 1412001808,1412001855,RO
@@ -37139,12 +37843,12 @@
 1424594520,1424595455,GB
 1424595456,1424595527,IT
 1424595528,1424595535,GB
-1424595536,1424595551,IT
-1424595552,1424595559,GB
-1424595560,1424595575,IT
+1424595536,1424595575,IT
 1424595576,1424595583,ES
-1424595584,1424595807,IT
-1424595808,1424595839,GB
+1424595584,1424595819,IT
+1424595820,1424595823,GB
+1424595824,1424595831,IT
+1424595832,1424595839,GB
 1424595840,1424596479,IT
 1424596480,1424596563,FR
 1424596564,1424596567,GB
@@ -37439,7 +38143,9 @@
 1425436672,1425438719,GB
 1425438720,1425439271,DE
 1425439272,1425439279,CZ
-1425439280,1425439535,DE
+1425439280,1425439399,DE
+1425439400,1425439407,CZ
+1425439408,1425439535,DE
 1425439536,1425439543,CZ
 1425439544,1425439711,DE
 1425439712,1425439727,CZ
@@ -37471,7 +38177,14 @@
 1425467392,1425469439,CH
 1425469440,1425471487,DK
 1425471488,1425473535,DE
-1425473536,1425506303,RO
+1425473536,1425474047,GB
+1425474048,1425474559,RO
+1425474560,1425475583,GB
+1425475584,1425478143,RO
+1425478144,1425478655,GB
+1425478656,1425484799,RO
+1425484800,1425485311,GB
+1425485312,1425506303,RO
 1425506304,1425522687,NO
 1425522688,1425539071,IT
 1425539072,1425801215,FI
@@ -37871,9 +38584,12 @@
 1427743232,1427743263,GR
 1427743264,1427743327,DE
 1427743328,1427743359,NL
-1427743360,1427743455,DE
+1427743360,1427743391,DE
+1427743392,1427743423,BR
+1427743424,1427743455,DE
 1427743456,1427743487,CY
-1427743488,1427743615,DE
+1427743488,1427743583,DE
+1427743584,1427743615,LV
 1427743616,1427743647,DK
 1427743648,1427743775,DE
 1427743776,1427743807,ZA
@@ -37881,7 +38597,8 @@
 1427743840,1427743871,RU
 1427743872,1427743935,DE
 1427743936,1427743967,RU
-1427743968,1427744159,DE
+1427743968,1427744127,DE
+1427744128,1427744159,PL
 1427744160,1427744191,RU
 1427744192,1427744255,DE
 1427744256,1427744287,US
@@ -37899,7 +38616,8 @@
 1427744992,1427745023,DK
 1427745024,1427745151,DE
 1427745152,1427745183,RO
-1427745184,1427745247,DE
+1427745184,1427745215,CH
+1427745216,1427745247,DE
 1427745248,1427745279,TR
 1427745280,1427745503,DE
 1427745504,1427745535,RU
@@ -37922,17 +38640,23 @@
 1427747840,1427747871,FI
 1427747872,1427748063,DE
 1427748064,1427748095,NL
-1427748096,1427748479,DE
+1427748096,1427748287,DE
+1427748288,1427748319,PK
+1427748320,1427748479,DE
 1427748480,1427748511,TR
 1427748512,1427748543,DE
 1427748544,1427748575,MX
-1427748576,1427749503,DE
+1427748576,1427748799,DE
+1427748800,1427748831,PK
+1427748832,1427749503,DE
 1427749504,1427749535,UA
 1427749536,1427749567,DE
 1427749568,1427749599,CY
 1427749600,1427749631,DE
 1427749632,1427749663,US
-1427749664,1427749951,DE
+1427749664,1427749887,DE
+1427749888,1427749919,BR
+1427749920,1427749951,DE
 1427749952,1427749983,RU
 1427749984,1427750239,DE
 1427750240,1427750271,NL
@@ -37949,13 +38673,15 @@
 1427760320,1427760351,DE
 1427760352,1427760383,RU
 1427760384,1427760415,TR
-1427760416,1427760799,DE
+1427760416,1427760575,DE
+1427760576,1427760607,CH
+1427760608,1427760799,DE
 1427760800,1427760831,NL
 1427760832,1427760959,DE
 1427760960,1427760991,CZ
 1427760992,1427761023,DE
 1427761024,1427761055,HR
-1427761056,1427761087,DE
+1427761056,1427761087,CL
 1427761088,1427761119,CH
 1427761120,1427761183,DE
 1427761184,1427761215,IT
@@ -38047,9 +38773,7 @@
 1431839040,1431846911,BE
 1431846912,1431855103,NO
 1431855104,1431863295,NL
-1431863296,1431864263,PT
-1431864264,1431864271,ES
-1431864272,1431864935,PT
+1431863296,1431864935,PT
 1431864936,1431864943,ES
 1431864944,1431865335,PT
 1431865336,1431865343,ES
@@ -38081,7 +38805,9 @@
 1431979480,1431979487,GB
 1431979488,1431980151,NL
 1431980152,1431980159,US
-1431980160,1431986175,NL
+1431980160,1431980719,NL
+1431980720,1431980727,SA
+1431980728,1431986175,NL
 1431986176,1431994367,RU
 1431994368,1432002559,AT
 1432002560,1432010751,HU
@@ -38205,6 +38931,7 @@
 1433739264,1433747455,GE
 1433747456,1433755647,RU
 1433755648,1433763839,EE
+1433763840,1433772031,FR
 1433772032,1433788415,SE
 1433788416,1433796607,UZ
 1433796608,1433804799,GB
@@ -38235,7 +38962,9 @@
 1433862752,1433862783,MC
 1433862784,1433862975,CH
 1433862976,1433862991,GB
-1433862992,1433863423,CH
+1433862992,1433863055,CH
+1433863056,1433863071,GB
+1433863072,1433863423,CH
 1433863424,1433863487,US
 1433863488,1433864191,CH
 1433864192,1433866239,HU
@@ -38308,19 +39037,17 @@
 1434689888,1434689919,NL
 1434689920,1434692607,DE
 1434692608,1434692671,NL
-1434692672,1434694655,DE
+1434692672,1434693119,DE
+1434693120,1434693375,NL
+1434693376,1434694655,DE
 1434694656,1434694719,NL
 1434694720,1434702463,DE
 1434702464,1434702591,NL
 1434702592,1434702655,DE
 1434702656,1434702671,NL
-1434702672,1434705663,DE
-1434705664,1434705679,NL
-1434705680,1434705695,DE
-1434705696,1434705919,NL
-1434705920,1434710591,DE
-1434710592,1434710783,NL
-1434710784,1434712063,DE
+1434702672,1434705727,DE
+1434705728,1434705919,NL
+1434705920,1434712063,DE
 1434712064,1434712319,NL
 1434712320,1434712959,DE
 1434712960,1434712975,NL
@@ -38381,6 +39108,7 @@
 1436473344,1436475391,RO
 1436475392,1436477439,AT
 1436477440,1436479487,CH
+1436479488,1436481535,RU
 1436481536,1436483583,NL
 1436483584,1436485631,UA
 1436485632,1436487471,DE
@@ -38534,7 +39262,9 @@
 1438995040,1438995047,GB
 1438995048,1438995067,DE
 1438995068,1438995071,SE
-1438995072,1438998781,DE
+1438995072,1438995647,DE
+1438995648,1438995711,GB
+1438995712,1438998781,DE
 1438998782,1438998783,CH
 1438998784,1438999098,DE
 1438999099,1438999103,CH
@@ -38546,12 +39276,12 @@
 1438999518,1438999518,CH
 1438999519,1438999533,DE
 1438999534,1438999534,CH
-1438999535,1438999791,DE
-1438999792,1438999807,GB
+1438999535,1438999551,DE
+1438999552,1438999807,GB
 1438999808,1439000575,DE
 1439000576,1439000831,NL
-1439000832,1439000839,DE
-1439000840,1439002623,NL
+1439000832,1439002367,DE
+1439002368,1439002623,NL
 1439002624,1439006567,DE
 1439006568,1439006575,AT
 1439006576,1439006671,DE
@@ -38584,7 +39314,27 @@
 1439367168,1439375359,NL
 1439375360,1439383551,DE
 1439383552,1439432703,NL
-1439432704,1439498239,RO
+1439432704,1439440383,RO
+1439440384,1439440895,GB
+1439440896,1439446527,RO
+1439446528,1439447039,GB
+1439447040,1439449087,RO
+1439449088,1439449855,GB
+1439449856,1439451135,RO
+1439451136,1439451647,GB
+1439451648,1439457279,RO
+1439457280,1439457791,GB
+1439457792,1439462911,RO
+1439462912,1439463167,GB
+1439463168,1439463679,RO
+1439463680,1439463935,GB
+1439463936,1439464447,RO
+1439464448,1439464703,GB
+1439464704,1439466495,RO
+1439466496,1439467007,GB
+1439467008,1439482367,RO
+1439482368,1439482879,GB
+1439482880,1439498239,RO
 1439498240,1439503103,DE
 1439503104,1439504127,GB
 1439504128,1439504383,DE
@@ -38631,7 +39381,9 @@
 1439629312,1439694847,CZ
 1439694848,1439825919,SA
 1439825920,1439956991,GB
-1439956992,1440251903,DE
+1439956992,1440204799,DE
+1440204800,1440215039,EU
+1440215040,1440251903,DE
 1440251904,1440284671,SK
 1440284672,1440317439,FI
 1440317440,1440350207,BG
@@ -38863,7 +39615,14 @@
 1446576128,1446608895,IR
 1446608896,1446641663,BY
 1446641664,1446674431,SI
-1446674432,1446707175,DK
+1446674432,1446694543,DK
+1446694544,1446694559,SE
+1446694560,1446694591,DK
+1446694592,1446694607,NO
+1446694608,1446694623,GB
+1446694624,1446694639,TH
+1446694640,1446694655,BR
+1446694656,1446707175,DK
 1446707176,1446707179,NO
 1446707180,1446707183,FI
 1446707184,1446707199,DK
@@ -39910,7 +40669,54 @@
 1449459712,1449525247,HU
 1449525248,1449590783,RU
 1449590784,1449656319,DE
-1449656320,1449808639,RO
+1449656320,1449657087,GB
+1449657088,1449658623,RO
+1449658624,1449659135,GB
+1449659136,1449660415,RO
+1449660416,1449662463,GB
+1449662464,1449676799,RO
+1449676800,1449678847,GB
+1449678848,1449685759,RO
+1449685760,1449686271,GB
+1449686272,1449686527,RO
+1449686528,1449687039,GB
+1449687040,1449687295,RO
+1449687296,1449688063,GB
+1449688064,1449690111,RO
+1449690112,1449690623,GB
+1449690624,1449705471,RO
+1449705472,1449705727,GB
+1449705728,1449706239,RO
+1449706240,1449706495,GB
+1449706496,1449707519,RO
+1449707520,1449709567,GB
+1449709568,1449710591,RO
+1449710592,1449711103,GB
+1449711104,1449711359,RO
+1449711360,1449711615,GB
+1449711616,1449717759,RO
+1449717760,1449718783,GB
+1449718784,1449767423,RO
+1449767424,1449767679,GB
+1449767680,1449773055,RO
+1449773056,1449774079,GB
+1449774080,1449776383,RO
+1449776384,1449776639,GB
+1449776640,1449779967,RO
+1449779968,1449780223,GB
+1449780224,1449780735,RO
+1449780736,1449780991,GB
+1449780992,1449783807,RO
+1449783808,1449784319,GB
+1449784320,1449785343,RO
+1449785344,1449786367,GB
+1449786368,1449787391,RO
+1449787392,1449790207,GB
+1449790208,1449790719,RO
+1449790720,1449791487,GB
+1449791488,1449795327,RO
+1449795328,1449795583,GB
+1449795584,1449808639,RO
 1449808640,1449808895,UA
 1449808896,1449840639,RO
 1449840640,1449852927,MD
@@ -40012,7 +40818,9 @@
 1466604800,1466605055,ES
 1466605056,1466606847,DE
 1466606848,1466607103,FR
-1466607104,1466613759,DE
+1466607104,1466608895,DE
+1466608896,1466609151,ES
+1466609152,1466613759,DE
 1466613760,1466615807,ES
 1466615808,1466616575,GB
 1466616576,1466617343,ES
@@ -40179,7 +40987,6 @@
 1475133440,1475135487,CZ
 1475135488,1475137535,CH
 1475137536,1475139583,SE
-1475139584,1475141631,BE
 1475141632,1475143679,FI
 1475143680,1475145727,JO
 1475145728,1475147775,ES
@@ -40204,7 +41011,7 @@
 1475181456,1475181471,SC
 1475181472,1475181519,DE
 1475181520,1475181535,GB
-1475181536,1475181551,ES
+1475181536,1475181551,NL
 1475181552,1475184639,DE
 1475184640,1475186687,RU
 1475186688,1475188735,ES
@@ -40249,13 +41056,19 @@
 1475208192,1475209215,AE
 1475209216,1475211263,UZ
 1475211264,1475213311,DE
-1475213312,1475215359,FR
+1475213312,1475214335,FR
+1475214336,1475214399,GB
+1475214400,1475214847,FR
+1475214848,1475214975,GB
+1475214976,1475215103,FR
+1475215104,1475215167,GB
+1475215168,1475215359,FR
 1475215360,1475223551,IT
 1475223552,1475229695,NO
 1475229696,1475229759,SE
 1475229760,1475229951,NO
-1475229952,1475230071,SE
-1475230072,1475233791,NO
+1475229952,1475230079,SE
+1475230080,1475233791,NO
 1475233792,1475234303,GB
 1475234304,1475234559,IE
 1475234560,1475235839,GB
@@ -40598,7 +41411,9 @@
 1481984512,1481984639,CY
 1481984640,1481985023,NL
 1481985024,1481985279,MT
-1481985280,1481987967,NL
+1481985280,1481987327,NL
+1481987328,1481987583,GB
+1481987584,1481987967,NL
 1481987968,1481988031,PA
 1481988032,1481988095,NL
 1481988096,1481988159,GI
@@ -40899,7 +41714,9 @@
 1494253568,1494261759,DE
 1494261760,1494269951,GB
 1494269952,1494278143,AT
-1494278144,1494286335,GB
+1494278144,1494282751,GB
+1494282752,1494283007,FR
+1494283008,1494286335,GB
 1494286336,1494294527,HR
 1494294528,1494302719,RU
 1494302720,1494310911,FI
@@ -41100,7 +41917,9 @@
 1495927296,1495927551,AE
 1495927552,1495937023,RO
 1495937024,1495937535,ES
-1495937536,1496078335,RO
+1495937536,1495986175,RO
+1495986176,1495988223,GB
+1495988224,1496078335,RO
 1496078336,1496079359,MD
 1496079360,1496121343,RO
 1496121344,1496122367,MD
@@ -41138,7 +41957,9 @@
 1500107776,1500107903,DE
 1500107904,1500107943,NL
 1500107944,1500107951,DE
-1500107952,1500110847,NL
+1500107952,1500108159,NL
+1500108160,1500108287,DE
+1500108288,1500110847,NL
 1500110848,1500119039,UA
 1500119040,1500127231,TR
 1500127232,1500135423,FI
@@ -41264,14 +42085,24 @@
 1502478336,1502605311,SI
 1502605312,1502606335,HR
 1502606336,1502609407,SI
-1502609408,1502625791,DE
+1502609408,1502624030,DE
+1502624031,1502624047,IR
+1502624048,1502624063,DE
+1502624064,1502624127,IR
+1502624128,1502625791,DE
 1502625792,1502642175,SA
 1502642176,1502658559,IR
 1502658560,1502674943,AT
 1502674944,1502691327,DE
-1502691328,1502692415,GB
+1502691328,1502691679,GB
+1502691680,1502691711,SE
+1502691712,1502692415,GB
 1502692416,1502692479,ES
-1502692480,1502707711,GB
+1502692480,1502706623,GB
+1502706624,1502706687,CY
+1502706688,1502707631,GB
+1502707632,1502707639,IE
+1502707640,1502707711,GB
 1502707712,1502724095,RU
 1502724096,1502740479,GB
 1502740480,1502756863,NL
@@ -41302,8 +42133,8 @@
 1502975264,1502975311,FR
 1502975312,1502975319,IE
 1502975320,1502975327,FR
-1502975328,1502975375,IE
-1502975376,1502975383,FR
+1502975328,1502975367,IE
+1502975368,1502975383,FR
 1502975384,1502975391,ES
 1502975392,1502975423,FR
 1502975424,1502975455,GB
@@ -41351,7 +42182,9 @@
 1502996736,1502997247,PL
 1502997248,1502997503,LT
 1502997504,1502997759,HK
-1502997760,1503000063,DE
+1502997760,1502999855,DE
+1502999856,1502999871,MK
+1502999872,1503000063,DE
 1503000064,1503000319,PL
 1503000320,1503000831,DE
 1503000832,1503001343,PL
@@ -41398,16 +42231,16 @@
 1503897304,1503897311,BE
 1503897312,1503897367,DE
 1503897368,1503897375,BE
-1503897376,1503897383,GR
-1503897384,1503897407,DE
+1503897376,1503897391,GR
+1503897392,1503897407,DE
 1503897408,1503897415,IT
 1503897416,1503897431,DE
 1503897432,1503897439,IT
 1503897440,1503897463,DE
 1503897464,1503897471,GR
 1503897472,1503897479,AT
-1503897480,1503897575,DE
-1503897576,1503897591,GB
+1503897480,1503897583,DE
+1503897584,1503897591,GB
 1503897592,1503898119,DE
 1503898120,1503898135,TH
 1503898136,1503898167,DE
@@ -41417,22 +42250,28 @@
 1503898192,1503898199,GR
 1503898200,1503898207,US
 1503898208,1503898215,BE
-1503898216,1503898223,DE
-1503898224,1503898231,CH
-1503898232,1503898239,GR
+1503898216,1503898239,DE
 1503898240,1503898303,IT
 1503898304,1503898311,BE
 1503898312,1503898327,DE
 1503898328,1503898335,AT
-1503898336,1503898343,CH
-1503898344,1503898351,DE
+1503898336,1503898351,DE
 1503898352,1503898359,CH
 1503898360,1503898415,DE
 1503898416,1503898423,BE
 1503898424,1503898431,CH
-1503898432,1503898567,DE
+1503898432,1503898503,DE
+1503898504,1503898511,GR
+1503898512,1503898567,DE
 1503898568,1503898575,NL
-1503898576,1503908351,DE
+1503898576,1503898583,GR
+1503898584,1503898599,DE
+1503898600,1503898607,IT
+1503898608,1503898615,GR
+1503898616,1503898623,SE
+1503898624,1503898631,DE
+1503898632,1503898647,GR
+1503898648,1503908351,DE
 1503908352,1503909375,IT
 1503909376,1503920127,DE
 1503920128,1503985663,HR
@@ -41506,14 +42345,7 @@
 1505305400,1505305407,PT
 1505305408,1505305415,US
 1505305416,1505305423,CH
-1505305424,1505305878,FR
-1505305879,1505305879,US
-1505305880,1505305880,ES
-1505305881,1505305899,FR
-1505305900,1505305900,GB
-1505305901,1505305901,DE
-1505305902,1505305902,IT
-1505305903,1505305908,FR
+1505305424,1505305908,FR
 1505305909,1505305909,LU
 1505305910,1505306303,FR
 1505306304,1505306319,ES
@@ -41522,10 +42354,10 @@
 1505306352,1505306367,IT
 1505306368,1505312767,FR
 1505312768,1505320959,RU
-1505320960,1505321151,AT
-1505321152,1505321183,DE
-1505321184,1505321343,AT
-1505321344,1505321471,DE
+1505320960,1505321103,AT
+1505321104,1505321135,DE
+1505321136,1505321407,AT
+1505321408,1505321471,DE
 1505321472,1505321631,AT
 1505321632,1505321823,DE
 1505321824,1505321831,AT
@@ -41556,7 +42388,9 @@
 1505336832,1505336863,GB
 1505336864,1505336864,IE
 1505336865,1505336879,GB
-1505336880,1505337087,IE
+1505336880,1505337023,IE
+1505337024,1505337055,GB
+1505337056,1505337087,IE
 1505337088,1505337215,GB
 1505337216,1505337343,IE
 1505337344,1505345535,FR
@@ -41675,7 +42509,9 @@
 1506418720,1506422655,DE
 1506422656,1506422687,CY
 1506422688,1506422703,CA
-1506422704,1506427663,DE
+1506422704,1506422719,DE
+1506422720,1506422751,US
+1506422752,1506427663,DE
 1506427664,1506427679,GB
 1506427680,1506428223,DE
 1506428224,1506428239,US
@@ -41684,17 +42520,17 @@
 1506437504,1506437631,DE
 1506437632,1506437887,MU
 1506437888,1506437903,CA
-1506437904,1506437951,US
+1506437904,1506437919,US
+1506437920,1506437951,IN
 1506437952,1506437983,DE
 1506437984,1506437991,US
 1506437992,1506437999,DE
 1506438000,1506438015,CA
-1506438016,1506438019,US
-1506438020,1506438143,DE
+1506438016,1506438143,DE
 1506438144,1506438271,HK
 1506438272,1506438367,GB
-1506438368,1506438384,IL
-1506438385,1506438399,DE
+1506438368,1506438383,IL
+1506438384,1506438399,GB
 1506438400,1506438527,US
 1506438528,1506438783,DE
 1506438784,1506438799,KR
@@ -41823,8 +42659,8 @@
 1506451904,1506452223,ES
 1506452224,1506452479,GB
 1506452480,1506452735,US
-1506452736,1506452743,RO
-1506452744,1506452991,GB
+1506452736,1506452751,RO
+1506452752,1506452991,GB
 1506452992,1506453247,AT
 1506453248,1506453391,SE
 1506453392,1506453399,ES
@@ -41895,7 +42731,8 @@
 1506467584,1506468351,IT
 1506468352,1506468607,GB
 1506468608,1506468863,TZ
-1506468864,1506470143,IT
+1506468864,1506469119,GB
+1506469120,1506470143,IT
 1506470144,1506470399,GB
 1506470400,1506470655,DE
 1506470656,1506471679,IT
@@ -41909,17 +42746,13 @@
 1506472448,1506472703,GB
 1506472704,1506473215,IT
 1506473216,1506473471,GB
-1506473472,1506473783,IT
-1506473784,1506473791,GB
-1506473792,1506474271,IT
+1506473472,1506474271,IT
 1506474272,1506474303,SE
 1506474304,1506474495,IT
 1506474496,1506474751,FR
-1506474752,1506474887,IT
-1506474888,1506474911,GB
-1506474912,1506475519,IT
-1506475520,1506475527,AT
-1506475528,1506476031,GB
+1506474752,1506475519,IT
+1506475520,1506475551,AT
+1506475552,1506476031,GB
 1506476032,1506508799,KW
 1506508800,1506541567,CZ
 1506541568,1506574335,RU
@@ -41968,7 +42801,9 @@
 1506799616,1506801663,LV
 1506801664,1506802767,DE
 1506802768,1506802775,DK
-1506802776,1506803135,DE
+1506802776,1506802831,DE
+1506802832,1506802839,CH
+1506802840,1506803135,DE
 1506803136,1506803151,CH
 1506803152,1506803711,DE
 1506803712,1506869247,RU
@@ -42062,8 +42897,8 @@
 1508647040,1508648447,SE
 1508648448,1508648703,DK
 1508648704,1508650751,SE
-1508650752,1508650823,DK
-1508650824,1508650879,SE
+1508650752,1508650831,DK
+1508650832,1508650879,SE
 1508650880,1508651263,DK
 1508651264,1508652543,SE
 1508652544,1508654079,DK
@@ -42226,7 +43061,9 @@
 1518503936,1518508799,LT
 1518508800,1518510079,SE
 1518510080,1518516479,LV
-1518516480,1518665727,SE
+1518516480,1518517247,SE
+1518517248,1518518271,LV
+1518518272,1518665727,SE
 1518665728,1518727167,RU
 1518727168,1518731263,SE
 1518731264,1518927871,DE
@@ -42238,8 +43075,10 @@
 1518962688,1518964735,NO
 1518964736,1518966783,HR
 1518966784,1518967807,SE
-1518967808,1518970367,HR
-1518970368,1518993407,SE
+1518967808,1518970879,HR
+1518970880,1518972927,SE
+1518972928,1518977023,HR
+1518977024,1518993407,SE
 1518993408,1519190015,RU
 1519190016,1519321087,SE
 1519321088,1519386623,RU
@@ -42466,11 +43305,7 @@
 1533413376,1533415423,DE
 1533415424,1533417471,SA
 1533417472,1533419519,NO
-1533419520,1533419775,KW
-1533419776,1533420031,SA
-1533420032,1533420287,KW
-1533420288,1533420543,AE
-1533420544,1533421567,KW
+1533419520,1533421567,KW
 1533421568,1533423615,NL
 1533423616,1533425663,IT
 1533425664,1533428479,GB
@@ -42546,7 +43381,9 @@
 1534129152,1534129407,A2
 1534129408,1534328831,AT
 1534328832,1534459903,ES
-1534459904,1534590975,AT
+1534459904,1534482091,AT
+1534482092,1534482095,GB
+1534482096,1534590975,AT
 1534590976,1534656511,HU
 1534656512,1534711807,FR
 1534711808,1534712831,BE
@@ -42603,7 +43440,8 @@
 1534714528,1534714531,FR
 1534714532,1534714535,PL
 1534714536,1534714539,GB
-1534714540,1534714547,FR
+1534714540,1534714543,DE
+1534714544,1534714547,FR
 1534714548,1534714551,ES
 1534714552,1534714559,GB
 1534714560,1534714575,NL
@@ -42804,8 +43642,9 @@
 1534718416,1534718431,FR
 1534718432,1534718447,PL
 1534718448,1534718463,FR
-1534718464,1534718479,DE
-1534718480,1534718531,FR
+1534718464,1534718467,DE
+1534718468,1534718471,PT
+1534718472,1534718531,FR
 1534718532,1534718535,PL
 1534718536,1534718539,DE
 1534718540,1534718543,ES
@@ -42845,7 +43684,7 @@
 1534719472,1534719487,IE
 1534719488,1534719631,FR
 1534719632,1534719639,ES
-1534719640,1534719643,GB
+1534719640,1534719643,DE
 1534719644,1534719647,FR
 1534719648,1534719655,ES
 1534719656,1534719679,FR
@@ -42859,7 +43698,9 @@
 1534719800,1534719803,ES
 1534719804,1534719807,GB
 1534719808,1534719823,FR
-1534719824,1534719839,CH
+1534719824,1534719827,PT
+1534719828,1534719831,FR
+1534719832,1534719839,PL
 1534719840,1534719871,FR
 1534719872,1534719887,PL
 1534719888,1534719951,FR
@@ -42897,8 +43738,7 @@
 1534720472,1534720479,DE
 1534720480,1534720495,GB
 1534720496,1534720511,PL
-1534720512,1534720527,DE
-1534720528,1534720535,FR
+1534720512,1534720535,FR
 1534720536,1534720539,PL
 1534720540,1534720543,FI
 1534720544,1534720559,FR
@@ -43187,7 +44027,10 @@
 1536659992,1536659999,EG
 1536660000,1536660003,DE
 1536660004,1536660007,SO
-1536660008,1536660031,DE
+1536660008,1536660015,DE
+1536660016,1536660019,CG
+1536660020,1536660023,DE
+1536660024,1536660031,CG
 1536660032,1536660039,DJ
 1536660040,1536660735,DE
 1536660736,1536660991,SA
@@ -43203,7 +44046,8 @@
 1536662360,1536662415,DE
 1536662416,1536662431,GN
 1536662432,1536662463,IQ
-1536662464,1536662783,DE
+1536662464,1536662527,SO
+1536662528,1536662783,DE
 1536662784,1536663039,SA
 1536663040,1536663295,DE
 1536663296,1536663311,LB
@@ -43298,7 +44142,9 @@
 1539049312,1539049327,LY
 1539049328,1539049335,IT
 1539049336,1539049343,LY
-1539049344,1539050367,IT
+1539049344,1539050263,IT
+1539050264,1539050271,TR
+1539050272,1539050367,IT
 1539050368,1539050375,FR
 1539050376,1539050383,IT
 1539050384,1539050399,FR
@@ -43308,9 +44154,7 @@
 1539055472,1539055487,FR
 1539055488,1539055511,IT
 1539055512,1539055519,DE
-1539055520,1539055567,IT
-1539055568,1539055575,FR
-1539055576,1539055615,IT
+1539055520,1539055615,IT
 1539055616,1539063807,LV
 1539063808,1539071999,FR
 1539072000,1539080191,PL
@@ -43359,7 +44203,8 @@
 1539212544,1539213311,CZ
 1539213312,1539215359,SE
 1539215360,1539219455,DE
-1539219456,1539221503,GG
+1539219456,1539219711,GB
+1539219712,1539221503,GG
 1539221504,1539222527,FR
 1539222528,1539222783,HK
 1539222784,1539223551,FR
@@ -44292,7 +45137,7 @@
 1539826176,1539826431,AM
 1539826432,1539826687,BE
 1539826688,1539826943,CH
-1539827200,1539827455,RU
+1539826944,1539827455,RU
 1539827456,1539827711,MK
 1539827712,1539827967,RU
 1539827968,1539828479,FR
@@ -45154,6 +45999,7 @@
 1540442624,1540442879,IE
 1540442880,1540443135,AT
 1540443136,1540443647,RU
+1540443648,1540443903,FR
 1540443904,1540444159,GB
 1540444160,1540444415,RU
 1540444416,1540444671,DE
@@ -45418,7 +46264,7 @@
 1540621824,1540622335,RU
 1540622336,1540622591,KW
 1540622592,1540622847,PL
-1540622848,1540623103,LV
+1540622848,1540623103,RU
 1540623104,1540623359,SE
 1540623360,1540623615,GB
 1540623616,1540623871,BG
@@ -45673,6 +46519,7 @@
 1540693504,1540693759,ES
 1540693760,1540694015,UZ
 1540694016,1540694271,CH
+1540694272,1540694527,UA
 1540694528,1540695039,RO
 1540695040,1540695295,DE
 1540695296,1540695551,NL
@@ -45754,7 +46601,7 @@
 1540716800,1540717055,UA
 1540717056,1540717311,CZ
 1540717312,1540717823,PL
-1540717824,1540718335,UA
+1540717824,1540718079,UA
 1540718336,1540718591,DE
 1540718592,1540718847,CH
 1540718848,1540719103,IT
@@ -46040,7 +46887,7 @@
 1540900352,1540900607,HU
 1540900608,1540900863,BG
 1540900864,1540901119,RU
-1540901120,1540901375,EU
+1540901120,1540901375,LV
 1540901376,1540901631,DE
 1540901632,1540901887,RO
 1540901888,1540902143,GR
@@ -46171,6 +47018,7 @@
 1540936960,1540937471,PL
 1540937472,1540937727,RU
 1540937728,1540937983,DE
+1540937984,1540938239,RU
 1540938240,1540938751,ES
 1540938752,1540939007,KZ
 1540939008,1540939263,FR
@@ -46299,7 +47147,7 @@
 1540989696,1540989951,PL
 1540989952,1540990207,FR
 1540990208,1540990463,DE
-1540990720,1540990975,UA
+1540990464,1540990975,UA
 1540990976,1540991231,FR
 1540991232,1540991487,HU
 1540991488,1540991743,CH
@@ -46362,6 +47210,7 @@
 1541007616,1541007871,RU
 1541007872,1541008127,FR
 1541008128,1541008383,NL
+1541008384,1541008639,RU
 1541008640,1541008895,GB
 1541008896,1541009151,TR
 1541009152,1541009407,RU
@@ -46496,8 +47345,7 @@
 1541146880,1541147135,IL
 1541147136,1541147391,PL
 1541147392,1541147903,RU
-1541147904,1541148159,EU
-1541148160,1541148415,RO
+1541147904,1541148415,RO
 1541148416,1541148671,GB
 1541148672,1541148927,RU
 1541148928,1541149439,PL
@@ -46572,7 +47420,7 @@
 1541167360,1541167615,AT
 1541167616,1541167871,RU
 1541167872,1541168127,UA
-1541168128,1541168383,RU
+1541168128,1541168639,RU
 1541168640,1541168895,MD
 1541168896,1541169151,MK
 1541169152,1541169407,RO
@@ -46661,6 +47509,69 @@
 1541191168,1541191423,TR
 1541191424,1541191679,RO
 1541191680,1541192191,NL
+1541192192,1541192447,RU
+1541192448,1541192703,ME
+1541192704,1541192959,RU
+1541192960,1541193215,BG
+1541193216,1541193471,UA
+1541193472,1541193727,BE
+1541193728,1541193983,SE
+1541193984,1541194239,IL
+1541194240,1541194495,SI
+1541194496,1541194751,JO
+1541194752,1541195007,NO
+1541195008,1541195263,FR
+1541195264,1541195519,UA
+1541195520,1541195775,GB
+1541195776,1541196031,FR
+1541196032,1541196287,NL
+1541196288,1541196543,RU
+1541196544,1541197055,UA
+1541197056,1541197311,PL
+1541197312,1541197567,RU
+1541197568,1541197823,MD
+1541197824,1541198079,GR
+1541198080,1541198335,LT
+1541198336,1541198591,AT
+1541198592,1541198847,RU
+1541198848,1541199103,GB
+1541199104,1541199359,SI
+1541199360,1541199615,GB
+1541199616,1541199871,RU
+1541199872,1541200127,GB
+1541200128,1541200383,NO
+1541200384,1541201151,RU
+1541201152,1541201407,SI
+1541201408,1541201663,PL
+1541201664,1541201919,RU
+1541201920,1541202175,IE
+1541202176,1541202431,PL
+1541202432,1541202687,ES
+1541202688,1541202943,SE
+1541202944,1541203199,DE
+1541203200,1541203455,ES
+1541203456,1541203711,UA
+1541203712,1541203967,GB
+1541203968,1541204223,RO
+1541204224,1541204479,RU
+1541204480,1541204735,GB
+1541204736,1541204991,UA
+1541204992,1541205247,GR
+1541205248,1541205503,SK
+1541205504,1541205759,PL
+1541205760,1541206015,AT
+1541206016,1541206271,SI
+1541206272,1541206527,FI
+1541206528,1541206783,TR
+1541206784,1541207039,NO
+1541207040,1541207295,DE
+1541207296,1541207807,FR
+1541207808,1541208063,HU
+1541208064,1541208319,FR
+1541208320,1541208575,NL
+1541208576,1541208831,BY
+1541208832,1541209087,HU
+1541209088,1541210111,UA
 1541210112,1541210623,RU
 1541210624,1541211135,CZ
 1541211136,1541211647,SK
@@ -46724,6 +47635,55 @@
 1541243392,1541243903,NO
 1541243904,1541244415,UA
 1541244416,1541244927,RS
+1541244928,1541245439,UA
+1541245440,1541245951,AT
+1541245952,1541246463,RU
+1541246464,1541246975,DK
+1541246976,1541247487,PL
+1541247488,1541247999,FR
+1541248000,1541248511,CZ
+1541248512,1541249023,NL
+1541249024,1541249535,GB
+1541249536,1541250047,UA
+1541250048,1541250559,RU
+1541250560,1541251071,PL
+1541251072,1541251583,NL
+1541251584,1541252607,RU
+1541252608,1541253119,UA
+1541253120,1541253631,GB
+1541253632,1541254143,SI
+1541254144,1541254655,PL
+1541254656,1541255679,RU
+1541255680,1541256191,UA
+1541256192,1541256703,RU
+1541256704,1541257215,DE
+1541257216,1541257727,SA
+1541257728,1541258239,EE
+1541258240,1541258751,RU
+1541258752,1541259263,UA
+1541259264,1541259775,CH
+1541259776,1541260287,RU
+1541260288,1541260799,DK
+1541260800,1541261823,RU
+1541261824,1541262335,SA
+1541262336,1541262847,DE
+1541262848,1541263359,DK
+1541263360,1541263871,NL
+1541263872,1541264383,UA
+1541264384,1541264895,CZ
+1541264896,1541265407,PL
+1541265408,1541265919,RS
+1541265920,1541266431,UA
+1541266432,1541266943,KW
+1541266944,1541267455,US
+1541267456,1541267967,FR
+1541267968,1541268479,DE
+1541268480,1541268991,AM
+1541268992,1541269503,NL
+1541269504,1541270015,RU
+1541270016,1541270527,UA
+1541270528,1541271039,IT
+1541271040,1541271551,FI
 1541275648,1541276671,UA
 1541276672,1541277695,RS
 1541277696,1541278719,ES
@@ -46734,6 +47694,32 @@
 1541283840,1541286911,UA
 1541286912,1541287935,DE
 1541287936,1541288959,UA
+1541288960,1541289983,CZ
+1541289984,1541291007,PL
+1541291008,1541293055,UA
+1541293056,1541295103,PL
+1541295104,1541297151,UA
+1541297152,1541298175,CH
+1541298176,1541299199,KZ
+1541299200,1541300223,RO
+1541300224,1541301247,DE
+1541301248,1541302271,PL
+1541302272,1541303295,SK
+1541303296,1541304319,PL
+1541304320,1541305343,UA
+1541305344,1541306367,PL
+1541306368,1541307391,RU
+1541307392,1541308415,PL
+1541308416,1541309439,RU
+1541309440,1541310463,CH
+1541310464,1541311487,UA
+1541311488,1541314559,PL
+1541314560,1541315583,UA
+1541315584,1541316607,RU
+1541316608,1541317631,PL
+1541317632,1541318655,RU
+1541318656,1541320703,UA
+1541320704,1541321727,DE
 1543503872,1545601023,GB
 1545601024,1545863167,SE
 1545863168,1545895935,RU
@@ -46817,9 +47803,7 @@
 1546313728,1546315775,DE
 1546315776,1546317823,NL
 1546317824,1546319871,CH
-1546319872,1546320383,RS
-1546320384,1546320387,SR
-1546320388,1546321919,RS
+1546319872,1546321919,RS
 1546321920,1546323967,RU
 1546323968,1546324479,GE
 1546324480,1546326015,NO
@@ -46861,15 +47845,9 @@
 1546649600,1546665983,SA
 1546665984,1546673823,GB
 1546673824,1546673839,RS
-1546673840,1546677535,GB
-1546677536,1546677551,IN
-1546677552,1546677555,GB
-1546677556,1546677557,IN
-1546677558,1546677559,GB
+1546673840,1546677559,GB
 1546677560,1546677561,IN
-1546677562,1546677679,GB
-1546677680,1546677695,IN
-1546677696,1546678863,GB
+1546677562,1546678863,GB
 1546678864,1546678871,RS
 1546678872,1546680831,GB
 1546680832,1546680895,RS
@@ -46921,7 +47899,8 @@
 1547485184,1547489279,IE
 1547489280,1547493375,DE
 1547493376,1547497471,RS
-1547497472,1547501567,GB
+1547497472,1547498495,NL
+1547498496,1547501567,GB
 1547501568,1547505663,TR
 1547505664,1547509759,RU
 1547509760,1547513855,LT
@@ -47059,7 +48038,33 @@
 1551007744,1551106047,MD
 1551106048,1551237119,DE
 1551237120,1551368191,GR
-1551368192,1551499263,NL
+1551368192,1551385151,NL
+1551385152,1551385215,TR
+1551385216,1551385343,DE
+1551385344,1551385471,CH
+1551385472,1551390719,NL
+1551390720,1551392767,DE
+1551392768,1551396863,NL
+1551396864,1551397375,GB
+1551397376,1551397887,NL
+1551397888,1551398271,GB
+1551398272,1551398399,NL
+1551398400,1551398911,IL
+1551398912,1551399935,NL
+1551399936,1551400959,IN
+1551400960,1551401983,NL
+1551401984,1551403007,SG
+1551403008,1551413247,NL
+1551413248,1551417343,CN
+1551417344,1551417855,NL
+1551417856,1551418879,CN
+1551418880,1551419391,NL
+1551419392,1551421439,CN
+1551421440,1551425535,PH
+1551425536,1551427583,TH
+1551427584,1551429631,HK
+1551429632,1551433727,TH
+1551433728,1551499263,NL
 1551499264,1551503359,EU
 1551503360,1551504383,GB
 1551504384,1551505407,FR
@@ -47178,7 +48183,6 @@
 1566081024,1566085119,RU
 1566085120,1566089215,NL
 1566089216,1566097407,RU
-1566097408,1566101503,GB
 1566101504,1566105599,RU
 1566105600,1566109695,DE
 1566109696,1566111231,CH
@@ -47439,7 +48443,9 @@
 1567830016,1567831039,MD
 1567831040,1567883263,RO
 1567883264,1567948799,MD
-1567948800,1568083967,RO
+1567948800,1568026623,RO
+1568026624,1568030719,MD
+1568030720,1568083967,RO
 1568083968,1568086015,MD
 1568086016,1568178175,RO
 1568178176,1568243711,RU
@@ -47508,7 +48514,9 @@
 1570635776,1570644991,FR
 1570644992,1570645039,GB
 1570645040,1570652159,FR
-1570652160,1570652543,SE
+1570652160,1570652287,SE
+1570652288,1570652291,MY
+1570652292,1570652543,SE
 1570652544,1570652551,FR
 1570652552,1570652891,SE
 1570652892,1570652895,DE
@@ -47617,7 +48625,8 @@
 1570667840,1570667903,FR
 1570667904,1570667907,SE
 1570667908,1570667911,RU
-1570667912,1570667967,SE
+1570667912,1570667915,US
+1570667916,1570667967,SE
 1570667968,1570667983,FR
 1570667984,1570668031,SE
 1570668032,1570668035,NL
@@ -47642,10 +48651,18 @@
 1571426304,1571428351,CZ
 1571428352,1571428863,UA
 1571428864,1571430399,CZ
-1571430400,1571435519,UA
-1571435520,1571446783,CZ
+1571430400,1571432447,UA
+1571432448,1571434495,CZ
+1571434496,1571435519,UA
+1571435520,1571440639,CZ
+1571440640,1571441663,UA
+1571441664,1571442175,KZ
+1571442176,1571442687,NL
+1571442688,1571446783,CZ
 1571446784,1571448831,KZ
-1571448832,1571553279,CZ
+1571448832,1571450879,US
+1571450880,1571451903,UA
+1571451904,1571553279,CZ
 1571553280,1571684351,IL
 1571684352,1571686399,ES
 1571686400,1571688447,GB
@@ -47806,11 +48823,12 @@
 1572541536,1572541951,GB
 1572541952,1572541983,DE
 1572541984,1572541999,ES
-1572542000,1572542207,GB
+1572542000,1572542015,GB
+1572542016,1572542031,HU
+1572542032,1572542207,GB
 1572542208,1572542463,FR
 1572542464,1572544511,IT
 1572546560,1572548607,FR
-1572548608,1572550655,GB
 1572550656,1572552703,DE
 1572552704,1572554751,TR
 1572554752,1572556799,CH
@@ -47853,6 +48871,7 @@
 1572620568,1572622335,CH
 1572622336,1572624383,RU
 1572624384,1572626431,NO
+1572626432,1572628479,IT
 1572628480,1572630527,DE
 1572630528,1572632575,IT
 1572632576,1572634623,RU
@@ -47871,7 +48890,9 @@
 1572661248,1572663295,NO
 1572663296,1572665343,DE
 1572665344,1572667391,NL
-1572667392,1572668303,GB
+1572667392,1572667903,GB
+1572667904,1572667919,SA
+1572667920,1572668303,GB
 1572668304,1572668311,SA
 1572668312,1572668415,GB
 1572668416,1572668431,SA
@@ -47910,7 +48931,9 @@
 1572720640,1572722687,IT
 1572722688,1572726783,RU
 1572726784,1572728831,CH
-1572728832,1572730879,SE
+1572728832,1572730239,SE
+1572730240,1572730303,MY
+1572730304,1572730879,SE
 1572730880,1572732927,RU
 1572732928,1572734975,HU
 1572734976,1572739071,RU
@@ -48031,10 +49054,12 @@
 1578590664,1578590667,FR
 1578590668,1578590687,PL
 1578590688,1578590699,FR
-1578590700,1578590719,PL
-1578590720,1578590799,FR
+1578590700,1578590731,PL
+1578590732,1578590735,DE
+1578590736,1578590799,FR
 1578590800,1578590831,GB
-1578590832,1578590847,ES
+1578590832,1578590839,FR
+1578590840,1578590847,PL
 1578590848,1578590879,FR
 1578590880,1578590911,PL
 1578590912,1578590927,GB
@@ -48130,8 +49155,8 @@
 1578592320,1578592335,ES
 1578592336,1578592351,FR
 1578592352,1578592367,PL
-1578592368,1578592383,FR
-1578592384,1578592399,IE
+1578592368,1578592395,FR
+1578592396,1578592399,ES
 1578592400,1578592415,GB
 1578592416,1578592423,IT
 1578592424,1578592431,IE
@@ -48154,8 +49179,7 @@
 1578592752,1578592783,DE
 1578592784,1578592799,FR
 1578592800,1578592815,GB
-1578592816,1578592823,PL
-1578592824,1578592831,FR
+1578592816,1578592831,FR
 1578592832,1578592847,PL
 1578592848,1578592851,BE
 1578592852,1578592855,DE
@@ -48202,7 +49226,10 @@
 1578593872,1578593875,ES
 1578593876,1578593879,FR
 1578593880,1578593887,DE
-1578593888,1578593919,FR
+1578593888,1578593895,ES
+1578593896,1578593899,GB
+1578593900,1578593903,DE
+1578593904,1578593919,FR
 1578593920,1578593951,PL
 1578593952,1578593955,FR
 1578593956,1578593967,PL
@@ -48212,7 +49239,9 @@
 1578594016,1578594031,BE
 1578594032,1578594039,ES
 1578594040,1578594047,IT
-1578594048,1578594063,FR
+1578594048,1578594055,FR
+1578594056,1578594059,ES
+1578594060,1578594063,FR
 1578594064,1578594079,PL
 1578594080,1578594087,CH
 1578594088,1578594095,CZ
@@ -48297,9 +49326,13 @@
 1578595376,1578595379,FR
 1578595380,1578595383,CH
 1578595384,1578595387,ES
-1578595388,1578595391,PL
-1578595392,1578595423,CH
-1578595424,1578595455,LT
+1578595388,1578595407,PL
+1578595408,1578595411,IE
+1578595412,1578595419,PL
+1578595420,1578595423,FR
+1578595424,1578595439,PL
+1578595440,1578595447,FR
+1578595448,1578595455,ES
 1578595456,1578595459,DE
 1578595460,1578595487,FR
 1578595488,1578595503,DE
@@ -48318,7 +49351,12 @@
 1578595760,1578595763,FR
 1578595764,1578595775,ES
 1578595776,1578595807,CH
-1578595808,1578595983,FR
+1578595808,1578595871,FR
+1578595872,1578595907,PL
+1578595908,1578595911,BE
+1578595912,1578595935,FR
+1578595936,1578595967,DE
+1578595968,1578595983,FR
 1578595984,1578595991,NL
 1578595992,1578595995,IT
 1578595996,1578596095,FR
@@ -48326,7 +49364,8 @@
 1578596100,1578596103,GB
 1578596104,1578596111,FR
 1578596112,1578596115,DE
-1578596116,1578596123,PT
+1578596116,1578596119,NL
+1578596120,1578596123,PT
 1578596124,1578596127,ES
 1578596128,1578596143,PL
 1578596144,1578596147,DE
@@ -48432,14 +49471,20 @@
 1578613712,1578613719,BE
 1578613720,1578613723,ES
 1578613724,1578613727,IT
-1578613728,1578613743,CZ
+1578613728,1578613743,FR
 1578613744,1578613751,ES
 1578613752,1578613759,NL
-1578613760,1578613791,DE
+1578613760,1578613775,DE
+1578613776,1578613779,FR
+1578613780,1578613783,PL
+1578613784,1578613787,BE
+1578613788,1578613791,PL
 1578613792,1578613823,ES
 1578613824,1578613887,IT
 1578613888,1578613951,ES
-1578613952,1578614015,IE
+1578613952,1578613983,FR
+1578613984,1578613999,PL
+1578614000,1578614015,CH
 1578614016,1578614031,FR
 1578614032,1578614047,BE
 1578614048,1578614071,FR
@@ -48603,7 +49648,9 @@
 1583800320,1583804415,ME
 1583804416,1583808511,GB
 1583808512,1583812607,MD
-1583812608,1583813663,NL
+1583812608,1583813171,NL
+1583813172,1583813175,US
+1583813176,1583813663,NL
 1583813664,1583813671,US
 1583813672,1583813679,NL
 1583813680,1583813683,GB
@@ -48614,8 +49661,8 @@
 1583813744,1583813808,NL
 1583813809,1583813815,US
 1583813816,1583815167,NL
-1583815168,1583815199,US
-1583815200,1583816703,NL
+1583815168,1583815215,US
+1583815216,1583816703,NL
 1583816704,1583820799,TR
 1583820800,1583824895,LV
 1583824896,1583828991,SI
@@ -48665,11 +49712,12 @@
 1585214464,1585217535,NL
 1585217536,1585219583,FR
 1585219584,1585221631,NL
-1585221632,1585221759,SK
-1585221760,1585223679,CZ
+1585221632,1585223679,SK
 1585223680,1585225727,FR
 1585225728,1585227775,UA
-1585227776,1585231871,RU
+1585227776,1585231359,RU
+1585231360,1585231615,NL
+1585231616,1585231871,RU
 1585231872,1585233919,CZ
 1585233920,1585235967,LB
 1585235968,1585238015,RU
@@ -48804,7 +49852,11 @@
 1585991936,1585991939,US
 1585991940,1585994499,SE
 1585994500,1585994503,RU
-1585994504,1585995775,SE
+1585994504,1585994543,SE
+1585994544,1585994547,MY
+1585994548,1585995647,SE
+1585995648,1585995651,US
+1585995652,1585995775,SE
 1585995776,1586003967,AT
 1586003968,1586012159,SK
 1586012160,1586020351,DE
@@ -48901,7 +49953,7 @@
 1586493440,1586495487,GB
 1586495488,1587019775,DK
 1587019776,1587085311,PL
-1587085312,1587183615,UA
+1587085312,1587150847,UA
 1587183616,1587199999,RU
 1587200000,1587216383,UA
 1587216384,1587347455,BG
@@ -49164,7 +50216,9 @@
 1593206084,1593206095,DK
 1593206096,1593206103,FI
 1593206104,1593206111,GB
-1593206112,1593209151,SE
+1593206112,1593206223,SE
+1593206224,1593206231,FI
+1593206232,1593209151,SE
 1593209152,1593209155,GR
 1593209156,1593209159,HU
 1593209160,1593209163,FI
@@ -49297,7 +50351,9 @@
 1600126976,1600389119,NL
 1600389120,1600397311,EU
 1600397312,1600401407,DE
-1600401408,1600520191,EU
+1600401408,1600453119,EU
+1600453120,1600453631,IT
+1600453632,1600520191,EU
 1600520192,1600651263,SK
 1600651264,1600684031,GE
 1600684032,1600749567,RU
@@ -49654,7 +50710,8 @@
 1604853760,1604861951,HU
 1604861952,1604870143,RS
 1604870144,1604878335,HR
-1604878336,1604886655,DE
+1604878336,1604886591,DE
+1604886592,1604886655,US
 1604886656,1604886783,RU
 1604886784,1604887039,DE
 1604887040,1604887295,GB
@@ -49667,7 +50724,7 @@
 1604891968,1604892159,RU
 1604892160,1604892927,DE
 1604892928,1604893183,HK
-1604893184,1604893311,RU
+1604893184,1604893311,DE
 1604893312,1604893375,TR
 1604893376,1604893439,DE
 1604893440,1604893695,TR
@@ -49680,7 +50737,10 @@
 1604895608,1604895611,SK
 1604895612,1604900351,CZ
 1604900352,1604900383,SC
-1604900384,1604902911,CZ
+1604900384,1604901631,CZ
+1604901632,1604901887,SK
+1604901888,1604902399,CZ
+1604902400,1604902911,SK
 1604902912,1604911103,BG
 1604911104,1604919295,UA
 1604919296,1604927487,NO
@@ -49782,7 +50842,9 @@
 1607614464,1607616511,GR
 1607616512,1607630847,A2
 1607630848,1607633919,IE
-1607633920,1607663615,A2
+1607633920,1607636991,A2
+1607636992,1607639039,IE
+1607639040,1607663615,A2
 1607663616,1607729151,NL
 1607729152,1607761919,EG
 1607761920,1607766015,SY
@@ -49941,8 +51003,8 @@
 1614282752,1614741503,US
 1614741504,1614757887,CA
 1614757888,1614774271,US
-1614774272,1614790655,CA
-1614790656,1632305151,US
+1614774272,1614786559,CA
+1614786560,1632305151,US
 1632305152,1632321535,CA
 1632321536,1632354303,US
 1632354304,1632354607,CA
@@ -50578,7 +51640,9 @@
 1654583104,1654583135,CA
 1654583136,1654599455,US
 1654599456,1654599471,CA
-1654599472,1654648831,US
+1654599472,1654599487,US
+1654599488,1654599519,BA
+1654599520,1654648831,US
 1654648832,1654652927,CA
 1654652928,1665833175,US
 1665833176,1665833183,A2
@@ -50695,15 +51759,75 @@
 1673986048,1674051583,CA
 1674051584,1674575871,US
 1674575872,1677721599,CA
-1694498816,1694499071,AP
-1694499072,1694499327,AU
-1697775616,1697776639,AP
-1700790272,1702887679,AU
-1711210496,1711276031,AP
+1677721600,1681915903,US
+1694498816,1694499327,AU
+1694499840,1694500863,ID
+1694500864,1694507007,JP
+1694507008,1694515199,IN
+1694515200,1694531583,AU
+1694531584,1694564351,TW
+1694565376,1694566399,HK
+1694566400,1694568447,KR
+1694568448,1694572543,HK
+1694572544,1694580735,KR
+1694580736,1694629887,JP
+1694662656,1694670847,JP
+1694670848,1694672895,BD
+1694672896,1694673919,AU
+1694674944,1694679039,LK
+1694679040,1694695423,AU
+1694695424,1694760959,TW
+1694760960,1695023103,CN
+1695023104,1695547391,TW
+1695547392,1697775615,CN
+1697775616,1697776639,AU
+1697776640,1697779711,JP
+1697779712,1697783807,ID
+1697783808,1697791999,JP
+1697841152,1697906687,TH
+1697906688,1697972223,CN
+1697996800,1698004991,JP
+1698037760,1698103295,CN
+1698160640,1698168831,JP
+1698168832,1698693119,IN
+1698693120,1699610623,CN
+1699611648,1699612671,JP
+1699612672,1699614719,LA
+1699614720,1699618815,PH
+1699676160,1699741695,KR
+1700793344,1700794367,VN
+1700855808,1700921343,AU
+1700921344,1700986879,NZ
+1701052416,1701117951,NZ
+1701142528,1701143551,HK
+1701208064,1701209087,JP
+1701249024,1701314559,AU
+1701314560,1701576703,CN
+1701576704,1701707775,TH
+1701736448,1701737471,NZ
+1701773312,1701838847,JP
+1701838848,1702363135,AU
+1702363136,1702821887,CN
+1702821888,1702889471,AU
+1702952960,1703411711,CN
+1703411712,1703673855,TW
+1703673856,1703935999,JP
+1704984576,1707081727,AU
+1707081728,1707343871,CN
+1707845632,1707846655,ID
+1707868160,1708130303,CN
+1709965312,1710227455,CN
+1711210496,1711276031,AU
 1795162112,1815822335,US
 1815822336,1815826431,CA
-1815826432,1815846911,US
+1815826432,1815871487,US
 1815871488,1815879679,CA
+1815879680,1815912447,US
+1815912448,1815920639,CA
+1815920640,1815928831,US
+1815928832,1815937023,BS
+1815937024,1816068095,US
+1816068096,1816133631,CA
 1816133632,1822425087,US
 1828716544,1830813695,FR
 1830813696,1831337983,NL
@@ -50711,8 +51835,8 @@
 1831862272,1832124415,PT
 1832124416,1832386559,IT
 1832386560,1832517631,DK
-1832517632,1832615935,SE
-1832615936,1832648703,DK
+1832517632,1832583167,SE
+1832583168,1832648703,DK
 1832648704,1832681471,HR
 1832681472,1832714239,RU
 1832714240,1832747007,HU
@@ -50774,7 +51898,9 @@
 1833285632,1833289727,FR
 1833289728,1833291775,IT
 1833291776,1833293823,CZ
-1833293824,1833295871,BE
+1833293824,1833294557,BE
+1833294558,1833294591,FR
+1833294592,1833295871,BE
 1833295872,1833297919,NL
 1833297920,1833299967,GB
 1833299968,1833302015,LU
@@ -50875,7 +52001,9 @@
 1833468288,1833468575,CH
 1833468576,1833468591,RU
 1833468592,1833471999,CH
-1833472000,1833476095,EU
+1833472000,1833474047,EU
+1833474048,1833474559,UA
+1833474560,1833476095,EU
 1833476096,1833477375,NL
 1833477376,1833477503,GB
 1833477504,1833477631,DE
@@ -50911,7 +52039,9 @@
 1833586688,1833590783,FR
 1833590784,1833594879,PL
 1833594880,1833603071,RU
-1833603072,1833607167,SK
+1833603072,1833606399,SK
+1833606400,1833606655,CZ
+1833606656,1833607167,SK
 1833607168,1833611263,RU
 1833611264,1833615359,NO
 1833615360,1833619455,GB
@@ -50971,9 +52101,7 @@
 1834956800,1834960895,IR
 1834960896,1834964991,RU
 1834964992,1834967039,PL
-1834967040,1834971135,RU
-1834971136,1834973183,UA
-1834973184,1834975231,RU
+1834967040,1834975231,RU
 1834975232,1834977279,IL
 1834977280,1834983423,PL
 1834983424,1834985471,RU
@@ -51061,7 +52189,9 @@
 1836015616,1836023807,AD
 1836023808,1836040191,RU
 1836040192,1836048383,GB
-1836048384,1836056575,RS
+1836048384,1836048467,RS
+1836048468,1836048471,SR
+1836048472,1836056575,RS
 1836056576,1836580863,IT
 1836580864,1836597247,RU
 1836597248,1836598015,LU
@@ -51111,7 +52241,9 @@
 1839595520,1839661055,RO
 1839661056,1839693823,UA
 1839693824,1839726591,RU
-1839726592,1839759359,IT
+1839726592,1839756327,IT
+1839756328,1839756335,FR
+1839756336,1839759359,IT
 1839759360,1839792127,RU
 1839792128,1839794687,GB
 1839794688,1839794943,US
@@ -51250,7 +52382,6 @@
 1841946624,1841954815,UA
 1841954816,1841971199,RU
 1841971200,1841979391,CZ
-1841979392,1841987583,NL
 1841987584,1841995775,DK
 1841995776,1842003967,RU
 1842003968,1842012159,CH
@@ -51398,8 +52529,8 @@
 1843990528,1843992575,LB
 1843992576,1843994623,AT
 1843994624,1844000767,GB
-1844000768,1844002047,NL
-1844002048,1844002815,NO
+1844000768,1844002303,NL
+1844002304,1844002815,NO
 1844002816,1844006911,CZ
 1844006912,1844008959,SM
 1844008960,1844011007,PL
@@ -51407,15 +52538,15 @@
 1844013056,1844015103,PL
 1844015104,1844017151,GB
 1844017152,1844019199,IT
-1844019200,1844021247,RU
-1844021248,1844027391,DE
+1844019200,1844027391,DE
 1844027392,1844029439,CZ
 1844029440,1844031487,RU
 1844031488,1844031743,EU
 1844031744,1844031999,CH
 1844032000,1844032255,GB
 1844032256,1844032511,CH
-1844032512,1844033535,EU
+1844032512,1844033279,EU
+1844033280,1844033535,CH
 1844033536,1844035583,RS
 1844035584,1844037631,MD
 1844037632,1844041727,RU
@@ -51478,9 +52609,10 @@
 1844162560,1844164607,CZ
 1844164608,1844166655,RU
 1844166656,1844168703,AZ
-1844168704,1844169487,SE
-1844169488,1844169503,IQ
-1844169504,1844169983,SE
+1844168704,1844169471,SE
+1844169472,1844169487,AF
+1844169488,1844169519,US
+1844169520,1844169983,SE
 1844169984,1844170387,DE
 1844170388,1844170751,SE
 1844170752,1844174847,RU
@@ -51547,7 +52679,7 @@
 1844322304,1844326399,CZ
 1844326400,1844330495,DK
 1844330496,1844334591,GB
-1844338688,1844342783,RU
+1844334592,1844342783,RU
 1844342784,1844346879,IT
 1844346880,1844347007,US
 1844347008,1844347135,GB
@@ -51639,7 +52771,7 @@
 1848401920,1848406015,PH
 1848406016,1848410111,NP
 1848410112,1848414207,PH
-1848418304,1848419327,AU
+1848418304,1848420351,AU
 1848420352,1848422399,ID
 1848422400,1848424447,JP
 1848424448,1848426495,VN
@@ -51866,7 +52998,7 @@
 1877704704,1877705727,AU
 1877706752,1877707775,SG
 1877707776,1877709823,AU
-1877710848,1877711871,AP
+1877710848,1877711871,HK
 1877712896,1877721087,CN
 1877721088,1877737471,TW
 1877737472,1877999615,JP
@@ -51966,9 +53098,11 @@
 1896587264,1896591359,SG
 1896591360,1896593407,ID
 1896593408,1896594431,AU
+1896594432,1896595455,MY
 1896595456,1896603647,CN
 1896603648,1896605695,IN
 1896605696,1896606719,AU
+1896606720,1896607743,MY
 1896607744,1896609791,VU
 1896611840,1897070591,CN
 1897070592,1897136127,IN
@@ -51979,8 +53113,9 @@
 1897144320,1897152511,NC
 1897152512,1897160703,FJ
 1897168896,1897169919,AU
+1897169920,1897170943,HK
 1897170944,1897172991,ID
-1897172992,1897175039,SG
+1897172992,1897175039,PH
 1897175040,1897176063,JP
 1897176064,1897177087,SG
 1897177088,1897185279,PH
@@ -52003,12 +53138,11 @@
 1897365504,1897398271,MY
 1897398272,1897660415,CN
 1897660416,1897725951,HK
-1897725952,1897758719,AP
 1897758720,1897779199,KR
 1897779200,1897781247,AU
 1897781248,1897783295,JP
 1897783296,1897787391,SG
-1897787392,1897788415,AU
+1897787392,1897789439,AU
 1897789440,1897790463,KH
 1897790464,1897791487,HK
 1897791488,1897824255,KR
@@ -52020,8 +53154,10 @@
 1899241472,1899249663,VN
 1899249664,1899266047,MO
 1899266048,1899267071,AU
+1899267072,1899268095,HK
 1899268096,1899270143,KR
 1899270144,1899271167,AU
+1899271168,1899272191,ID
 1899272192,1899273215,SG
 1899273216,1899274239,JP
 1899274240,1899282431,CN
@@ -52046,6 +53182,7 @@
 1904361472,1904369663,KR
 1904369664,1904375807,CN
 1904375808,1904376831,NZ
+1904376832,1904377855,KH
 1904377856,1904476159,KR
 1904476160,1905262591,CN
 1905262592,1906311167,JP
@@ -52059,9 +53196,11 @@
 1908744192,1908748287,JP
 1908748288,1908750335,PK
 1908752384,1908753407,NZ
+1908753408,1908754431,PF
 1908754432,1908756479,PH
 1908756480,1908760575,KR
 1908760576,1908761599,NZ
+1908761600,1908762623,CN
 1908762624,1908763647,IN
 1908764672,1908768767,AP
 1908768768,1908801535,JP
@@ -52069,6 +53208,7 @@
 1908899840,1908932607,NP
 1908932608,1909129215,CN
 1909129216,1909161983,AU
+1909161984,1909194751,PK
 1909194752,1909456895,CN
 1909456896,1909473279,JP
 1909473280,1909481471,HK
@@ -52077,6 +53217,7 @@
 1909719040,1909735423,CN
 1909735424,1909743615,IN
 1909743616,1909744639,AU
+1909744640,1909745663,CN
 1909745664,1909746687,JP
 1909746688,1909747711,MY
 1909747712,1909751807,ID
@@ -52259,6 +53400,7 @@
 1933959168,1933963263,JP
 1933963264,1933967359,IN
 1933967360,1934032895,AU
+1934032896,1934098431,KR
 1934098432,1934622719,VN
 1934622720,1934884863,TW
 1934884864,1934901247,CN
@@ -52357,7 +53499,7 @@
 1941659648,1941667839,NZ
 1941667840,1941700607,AU
 1941700608,1941831679,NZ
-1941962752,1945108479,CN
+1941831680,1945108479,CN
 1945108480,1946157055,IN
 1946157056,1946159103,ID
 1946159104,1946161151,MY
@@ -52429,7 +53571,7 @@
 1950543872,1950545919,NZ
 1950545920,1950547967,PH
 1950547968,1950580735,KR
-1950613504,1950617599,GU
+1950613504,1950621695,GU
 1950621696,1950629887,KR
 1950629888,1950646271,IN
 1950646272,1950648319,VN
@@ -52552,8 +53694,11 @@
 1960574976,1960837119,JP
 1960837120,1961885695,CN
 1961885696,1961951231,AU
+1961951232,1962016767,TW
 1962016768,1962541055,CN
-1962541056,1962672127,AU
+1962541056,1962622975,AU
+1962639360,1962658815,NZ
+1962658816,1962659839,HK
 1962672128,1962803199,CN
 1962803200,1962827775,JP
 1962827776,1962829823,ID
@@ -52561,6 +53706,7 @@
 1962831872,1962835967,ID
 1962835968,1962868735,CN
 1962868736,1962885119,AU
+1962885120,1962901503,KR
 1962901504,1962934271,CN
 1962934272,1963458559,VN
 1963458560,1963982847,CN
@@ -52747,6 +53893,7 @@
 1986525184,1986527231,BN
 1986527232,1986723839,JP
 1986723840,1986740223,AU
+1986740224,1986756607,VN
 1986756608,1986760703,PK
 1986760704,1986762751,AU
 1986764800,1986768895,KR
@@ -52758,7 +53905,8 @@
 1988083712,1988362239,KR
 1988362240,1988624383,CN
 1988624384,1988755455,ID
-1988755456,1988886527,AU
+1988755456,1988861951,AU
+1988870144,1988886527,KR
 1988886528,1989148671,HK
 1989148672,1989410815,CN
 1989410816,1989541887,NZ
@@ -52819,6 +53967,7 @@
 1997635584,1997643775,AU
 1997651968,1997668351,VN
 1997668352,1997684735,AU
+1997684736,1997701119,KR
 1997701120,1997705215,VN
 1997705216,1997707263,BD
 1997707264,1997709311,ID
@@ -52952,7 +54101,8 @@
 2007498752,2008023039,JP
 2008023040,2009071615,CN
 2009071616,2011168767,KR
-2011168768,2011234303,NZ
+2011168768,2011205631,NZ
+2011217920,2011234303,JP
 2011234304,2011299839,AU
 2011299840,2011430911,IN
 2011430912,2011693055,JP
@@ -53032,8 +54182,7 @@
 2019035136,2019037183,CN
 2019037184,2019041279,JP
 2019041280,2019045375,IN
-2019049472,2019057663,AU
-2019065856,2019082239,AU
+2019049472,2019082239,AU
 2019098624,2019115007,PH
 2019115008,2019117055,US
 2019117056,2019119103,IN
@@ -53110,6 +54259,7 @@
 2033623040,2033625087,PH
 2033625088,2033627135,HK
 2033627136,2033629183,NZ
+2033629184,2033631231,JP
 2033631232,2033647615,KR
 2033647616,2033663999,CN
 2033664000,2033696767,KR
@@ -53182,6 +54332,7 @@
 2043199488,2043201535,BD
 2043201536,2043203583,JP
 2043203584,2043205631,AU
+2043205632,2043207679,JP
 2043207680,2043211775,AU
 2043215872,2043281407,CN
 2043281408,2043412479,HK
@@ -53236,6 +54387,7 @@
 2053439488,2053505023,KR
 2053505024,2053509119,CN
 2053509120,2053511167,AU
+2053511168,2053513215,IN
 2053513216,2053515263,BD
 2053517312,2053519359,ID
 2053519360,2053521407,BD
@@ -53261,8 +54413,10 @@
 2055241728,2055274495,KR
 2055274496,2055290879,AU
 2055290880,2055299071,PK
-2055299072,2055307263,ID
+2055299072,2055305215,ID
+2055305216,2055307263,MY
 2055307264,2055315455,AU
+2055315456,2055323647,JP
 2055323648,2055327743,ID
 2055327744,2055329791,KR
 2055331840,2055335935,JP
@@ -53282,6 +54436,7 @@
 2056781824,2056794111,JP
 2056794112,2056796159,BD
 2056798208,2056806399,JP
+2056806400,2056814591,KR
 2056814592,2056815167,JP
 2056815168,2056815195,HK
 2056815196,2056815215,JP
@@ -53365,6 +54520,7 @@
 2063081472,2063085567,BD
 2063085568,2063089663,CN
 2063089664,2063097855,JP
+2063097856,2063106047,MM
 2063106048,2063106559,SG
 2063106560,2063106815,JP
 2063106816,2063107423,SG
@@ -53393,6 +54549,7 @@
 2063114328,2063116287,JP
 2063116288,2063116319,SG
 2063116320,2063122431,JP
+2063122432,2063138815,SG
 2063138816,2063335423,JP
 2063335424,2063341567,AU
 2063341568,2063351807,AP
@@ -53400,6 +54557,7 @@
 2063368192,2063370239,AP
 2063370240,2063372287,JP
 2063372288,2063374335,AP
+2063374336,2063376383,NZ
 2063376384,2063380479,TW
 2063380480,2063382527,KH
 2063384576,2063392767,KR
@@ -53471,6 +54629,7 @@
 2070704128,2070708223,PH
 2070708224,2070712319,CN
 2070712320,2070714367,NZ
+2070714368,2070716415,JP
 2070716416,2070724607,KR
 2070724608,2070726655,JP
 2070726656,2070728703,IN
@@ -53587,6 +54746,7 @@
 2083045376,2083053567,AU
 2083053568,2083057663,TH
 2083057664,2083058687,AU
+2083058688,2083059711,IN
 2083059712,2083061759,ID
 2083061760,2083110911,JP
 2083110912,2083127295,NP
@@ -53614,6 +54774,7 @@
 2086141952,2086666239,CN
 2086666240,2087190527,JP
 2087190528,2087452671,PH
+2087452672,2087453695,AU
 2087453696,2087454719,KH
 2087454720,2087456767,CN
 2087456768,2087458815,BD
@@ -53670,6 +54831,7 @@
 2090565632,2090582015,TW
 2090582016,2090590207,SG
 2090590208,2090594303,NZ
+2090594304,2090598399,IN
 2090598400,2090663935,CN
 2090663936,2090680319,AU
 2090680320,2090696703,NZ
@@ -53717,7 +54879,7 @@
 2094759936,2094792703,JP
 2094792704,2096152575,CN
 2096152576,2096160767,PG
-2096168960,2096234495,JP
+2096160768,2096234495,JP
 2096234496,2096300031,CN
 2096300032,2096332799,KR
 2096332800,2096349183,AU
@@ -53730,6 +54892,7 @@
 2096611328,2096627711,IN
 2096627712,2096660479,CN
 2096660480,2096664575,NZ
+2096664576,2096668671,JP
 2096668672,2096676863,KH
 2096676864,2096693247,HK
 2096693248,2096889855,CN
@@ -53872,7 +55035,8 @@
 2113724928,2113725183,IN
 2113725184,2113728511,AP
 2113728512,2113732607,JP
-2113732608,2113765375,AU
+2113732608,2113761279,AU
+2113761280,2113765375,VN
 2113765376,2113798143,HK
 2113798144,2113811455,AU
 2113812480,2113813503,JP
@@ -53932,9 +55096,7 @@
 2163212288,2163277823,GB
 2163277824,2163288063,US
 2163288064,2163290111,A1
-2163290112,2163300351,US
-2163300352,2163300607,A1
-2163300608,2163304447,US
+2163290112,2163304447,US
 2163304448,2163305983,A1
 2163305984,2163408895,US
 2163408896,2163474431,GB
@@ -54087,9 +55249,7 @@
 2187229472,2187229479,A1
 2187229480,2187229607,US
 2187229608,2187229615,A1
-2187229616,2187229687,US
-2187229688,2187229695,A1
-2187229696,2187230111,US
+2187229616,2187230111,US
 2187230112,2187230143,A1
 2187230144,2187232511,US
 2187232512,2187232639,A1
@@ -54369,7 +55529,15 @@
 2249781256,2249785343,US
 2249785344,2249850879,SE
 2249850880,2249916415,US
-2249916416,2249981951,NL
+2249916416,2249924863,NL
+2249924864,2249925119,US
+2249925120,2249928703,NL
+2249928704,2249930751,US
+2249930752,2249931775,NL
+2249931776,2249932799,US
+2249932800,2249932927,NL
+2249932928,2249933055,BR
+2249933056,2249981951,NL
 2249981952,2250047487,DE
 2250047488,2250113023,US
 2250113024,2250178559,DE
@@ -54959,7 +56127,8 @@
 2331901952,2331967487,US
 2332033024,2332622847,DE
 2332688384,2332753919,NL
-2332753920,2334064639,DE
+2332753920,2333868031,DE
+2333933568,2334064639,DE
 2334064640,2334916607,US
 2334916608,2334982143,AU
 2334982144,2335178751,US
@@ -55113,9 +56282,7 @@
 2359689216,2359754751,SE
 2359754752,2359820287,CA
 2359820288,2359885823,AU
-2359885824,2360215807,US
-2360215808,2360216063,A1
-2360216064,2360672255,US
+2359885824,2360672255,US
 2360672256,2360737791,DE
 2360737792,2360868863,US
 2360868864,2360934399,CA
@@ -55457,7 +56624,9 @@
 2436300800,2436366335,GB
 2436366336,2436759551,NL
 2436759552,2436825087,GB
-2436825088,2447376383,NL
+2436825088,2446983167,NL
+2446983168,2447048703,EU
+2447048704,2447376383,NL
 2447376384,2447441919,GB
 2447441920,2447507455,DE
 2447507456,2447572991,FR
@@ -56082,9 +57251,7 @@
 2574315008,2574315263,NO
 2574315264,2574319615,SE
 2574319616,2574647295,US
-2583691264,2584018943,US
-2584018944,2584084479,CA
-2584084480,2584215551,US
+2583691264,2584215551,US
 2584215552,2584281087,GB
 2584281088,2584346623,US
 2584346624,2584412159,KR
@@ -57516,7 +58683,7 @@
 2853765120,2853830655,MX
 2853830656,2854617087,US
 2854617088,2854682623,MY
-2854682624,2855469055,US
+2854748160,2855469055,US
 2855469056,2855534591,AR
 2855534592,2856058879,US
 2856058880,2856124415,CH
@@ -57924,9 +59091,7 @@
 2915811136,2915811199,IN
 2915811200,2915958783,US
 2915958784,2916024319,CA
-2916024320,2916110623,US
-2916110624,2916110639,CA
-2916110640,2916163583,US
+2916024320,2916163583,US
 2916163584,2916171775,CA
 2916171776,2916184063,US
 2916184064,2916196351,CA
@@ -57934,10 +59099,10 @@
 2916253696,2916286463,CA
 2916286464,2916319231,US
 2916319232,2916335615,PR
-2916352000,2916368383,US
+2916335616,2916368383,US
 2916368384,2916401151,CA
-2916401152,2916417535,US
-2916417536,2916434431,CA
+2916401152,2916433919,US
+2916433920,2916434431,CA
 2916434432,2916434559,US
 2916434560,2916434591,CA
 2916434592,2916437503,US
@@ -57948,14 +59113,17 @@
 2916440144,2916440159,CA
 2916440160,2916440175,US
 2916440176,2916440191,CA
-2916440192,2916441119,US
+2916440192,2916440223,US
+2916440224,2916440239,CA
+2916440240,2916440255,US
+2916440256,2916440271,CA
+2916440272,2916441119,US
 2916441120,2916441151,CA
 2916441152,2916441343,US
 2916441344,2916442111,CA
 2916442112,2916442623,US
 2916442624,2916442879,CA
-2916442880,2916443582,US
-2916443583,2916443614,PK
+2916442880,2916443614,US
 2916443615,2916443647,CA
 2916443648,2916443903,US
 2916443904,2916444159,CA
@@ -58067,7 +59235,11 @@
 2918404096,2918408191,PR
 2918408192,2918432767,US
 2918432768,2918436863,CA
-2918436864,2918533119,US
+2918436864,2918469631,US
+2918469632,2918473727,CA
+2918473728,2918477823,US
+2918477824,2918481919,CA
+2918481920,2918533119,US
 2918533120,2918533127,CN
 2918533128,2918533167,US
 2918533168,2918533183,CN
@@ -58079,8 +59251,7 @@
 2918580224,2918588415,CA
 2918588416,2918596607,US
 2918596608,2918604799,CA
-2918604800,2918608895,US
-2918612992,2918760447,US
+2918604800,2918760447,US
 2918760448,2918776831,CA
 2918776832,2918813695,US
 2918825984,2918828031,US
@@ -58152,7 +59323,9 @@
 2928173960,2928173967,CA
 2928173968,2928174095,US
 2928174096,2928174103,CA
-2928174104,2928174575,US
+2928174104,2928174223,US
+2928174224,2928174231,CA
+2928174232,2928174575,US
 2928174576,2928174583,AU
 2928174584,2928174911,US
 2928174912,2928174919,AU
@@ -59013,7 +60186,8 @@
 2938710016,2938712063,AU
 2938712064,2938716159,TW
 2938716160,2938732543,JP
-2938732544,2938765311,SG
+2938732544,2938748927,SG
+2938748928,2938765311,JP
 2938765312,2938961919,CN
 2938961920,2938978303,HK
 2938978304,2938996735,AU
@@ -59121,9 +60295,13 @@
 2987433216,2987433235,KZ
 2987433236,2987433239,RU
 2987433240,2987433287,KZ
-2987433288,2987433295,RU
-2987433296,2987433331,KZ
-2987433332,2987433983,RU
+2987433288,2987433291,RU
+2987433292,2987433331,KZ
+2987433332,2987433335,RU
+2987433336,2987433339,KZ
+2987433340,2987433407,RU
+2987433408,2987433471,KZ
+2987433472,2987433983,RU
 2987433984,2987438079,FR
 2987438080,2987442175,FI
 2987442176,2987446271,IE
@@ -59334,7 +60512,11 @@
 2988441888,2988441895,FR
 2988441896,2988441903,PL
 2988441904,2988441911,IT
-2988441912,2988441991,FR
+2988441912,2988441915,DE
+2988441916,2988441919,ES
+2988441920,2988441951,FR
+2988441952,2988441983,IT
+2988441984,2988441991,FR
 2988441992,2988441995,ES
 2988441996,2988442003,FR
 2988442004,2988442007,ES
@@ -59349,7 +60531,14 @@
 2988442432,2988442439,CZ
 2988442440,2988442447,ES
 2988442448,2988442463,GB
-2988442464,2988442895,FR
+2988442464,2988442623,FR
+2988442624,2988442639,NL
+2988442640,2988442647,PL
+2988442648,2988442651,DE
+2988442652,2988442655,GB
+2988442656,2988442671,IT
+2988442672,2988442675,GB
+2988442676,2988442895,FR
 2988442896,2988442899,PL
 2988442900,2988442903,FR
 2988442904,2988442907,IT
@@ -59408,10 +60597,23 @@
 2988444772,2988444775,GB
 2988444776,2988444783,CZ
 2988444784,2988444799,FR
-2988444800,2988445055,ES
-2988445056,2988445119,FR
-2988445120,2988445151,IT
-2988445152,2988445183,GB
+2988444800,2988444927,ES
+2988444928,2988444931,PL
+2988444932,2988444943,DE
+2988444944,2988444959,PL
+2988444960,2988444999,FR
+2988445000,2988445007,PL
+2988445008,2988445023,FR
+2988445024,2988445027,PL
+2988445028,2988445031,FR
+2988445032,2988445035,ES
+2988445036,2988445039,PL
+2988445040,2988445119,FR
+2988445120,2988445127,ES
+2988445128,2988445135,FR
+2988445136,2988445143,GB
+2988445144,2988445151,FR
+2988445152,2988445183,IT
 2988445184,2988445951,DE
 2988445952,2988445967,FR
 2988445968,2988445983,GB
@@ -59546,7 +60748,9 @@
 2988459200,2988459215,FR
 2988459216,2988459219,DE
 2988459220,2988459223,FR
-2988459224,2988459263,PL
+2988459224,2988459227,DE
+2988459228,2988459231,ES
+2988459232,2988459263,PL
 2988459264,2988459519,ES
 2988459520,2988459583,DE
 2988459584,2988459599,FR
@@ -59624,8 +60828,7 @@
 2988460608,2988460615,IT
 2988460616,2988460623,PL
 2988460624,2988460679,FR
-2988460680,2988460683,GB
-2988460684,2988460687,DE
+2988460680,2988460687,DE
 2988460688,2988460719,FR
 2988460720,2988460735,ES
 2988460736,2988460759,FR
@@ -59686,7 +60889,8 @@
 2988461712,2988461719,FR
 2988461720,2988461723,GB
 2988461724,2988461735,FR
-2988461736,2988461747,DE
+2988461736,2988461743,DE
+2988461744,2988461747,ES
 2988461748,2988461751,IT
 2988461752,2988461755,FR
 2988461756,2988461759,NL
@@ -59714,7 +60918,11 @@
 2988462144,2988462151,PL
 2988462152,2988462155,IT
 2988462156,2988462159,NL
-2988462160,2988462191,PL
+2988462160,2988462163,DE
+2988462164,2988462167,ES
+2988462168,2988462171,PT
+2988462172,2988462175,ES
+2988462176,2988462191,PL
 2988462192,2988462199,FR
 2988462200,2988462203,PL
 2988462204,2988462303,FR
@@ -59757,7 +60965,7 @@
 2988463152,2988463159,FR
 2988463160,2988463167,ES
 2988463168,2988463199,NL
-2988463200,2988463203,GB
+2988463200,2988463203,PL
 2988463204,2988463207,DE
 2988463208,2988463211,FR
 2988463212,2988463223,GB
@@ -59901,7 +61109,100 @@
 2988466132,2988466139,FR
 2988466140,2988466143,PL
 2988466144,2988466175,NL
-2988466176,2988507135,FR
+2988466176,2988476415,FR
+2988476416,2988478463,IT
+2988478464,2988482935,FR
+2988482936,2988482939,PL
+2988482940,2988482943,LT
+2988482944,2988482959,PL
+2988482960,2988482975,CZ
+2988482976,2988482987,DE
+2988482988,2988483079,FR
+2988483080,2988483087,IT
+2988483088,2988483091,FR
+2988483092,2988483095,BE
+2988483096,2988483099,FR
+2988483100,2988483103,DE
+2988483104,2988483111,ES
+2988483112,2988483115,FR
+2988483116,2988483119,PL
+2988483120,2988483135,GB
+2988483136,2988483151,FR
+2988483152,2988483155,CH
+2988483156,2988483159,FR
+2988483160,2988483167,ES
+2988483168,2988483199,GB
+2988483200,2988483267,FR
+2988483268,2988483271,NL
+2988483272,2988483279,DE
+2988483280,2988483283,ES
+2988483284,2988483295,DE
+2988483296,2988483299,FR
+2988483300,2988483303,NL
+2988483304,2988483319,FR
+2988483320,2988483327,PL
+2988483328,2988483335,BE
+2988483336,2988483343,DE
+2988483344,2988483351,GB
+2988483352,2988483359,FR
+2988483360,2988483367,ES
+2988483368,2988483375,PL
+2988483376,2988483383,GB
+2988483384,2988483427,FR
+2988483428,2988483431,BE
+2988483432,2988483435,FR
+2988483436,2988483439,DE
+2988483440,2988483447,FR
+2988483448,2988483455,DE
+2988483456,2988483711,FR
+2988483712,2988483743,PL
+2988483744,2988483767,GB
+2988483768,2988483775,FR
+2988483776,2988483871,PL
+2988483872,2988483879,DE
+2988483880,2988483887,ES
+2988483888,2988483895,GB
+2988483896,2988483903,DE
+2988483904,2988483935,PT
+2988483936,2988483951,ES
+2988483952,2988483963,IT
+2988483964,2988483967,FR
+2988483968,2988483983,IE
+2988483984,2988483991,NL
+2988483992,2988483999,FR
+2988484000,2988484003,GB
+2988484004,2988484007,DE
+2988484008,2988484011,FR
+2988484012,2988484015,IE
+2988484016,2988484031,FR
+2988484032,2988484039,IT
+2988484040,2988484047,NL
+2988484048,2988484095,FR
+2988484096,2988484111,DE
+2988484112,2988484127,FR
+2988484128,2988484131,PT
+2988484132,2988484135,PL
+2988484136,2988484143,NL
+2988484144,2988484159,FR
+2988484160,2988484163,GB
+2988484164,2988484167,PT
+2988484168,2988484191,ES
+2988484192,2988484207,DE
+2988484208,2988484223,FR
+2988484224,2988484239,ES
+2988484240,2988484243,DE
+2988484244,2988484287,FR
+2988484288,2988484351,PL
+2988484352,2988485883,FR
+2988485884,2988485887,GB
+2988485888,2988485903,PL
+2988485904,2988485911,GB
+2988485912,2988485951,FR
+2988485952,2988485955,GB
+2988485956,2988485959,CZ
+2988485960,2988485967,FR
+2988485968,2988485983,IE
+2988485984,2988507135,FR
 2988507136,2988507183,DE
 2988507184,2988507199,FR
 2988507200,2988507203,GB
@@ -59922,7 +61223,7 @@
 2988507432,2988507439,DE
 2988507440,2988507443,IT
 2988507444,2988507447,NL
-2988507448,2988507451,PL
+2988507448,2988507451,IT
 2988507452,2988507459,FR
 2988507460,2988507463,BE
 2988507464,2988507467,CH
@@ -59938,11 +61239,12 @@
 2988507532,2988507535,PL
 2988507536,2988507539,FR
 2988507540,2988507543,PL
-2988507544,2988507551,FR
+2988507544,2988507547,FR
+2988507548,2988507551,DE
 2988507552,2988507567,GB
 2988507568,2988507583,IE
 2988507584,2988507591,ES
-2988507592,2988507595,FR
+2988507592,2988507595,GB
 2988507596,2988507599,DE
 2988507600,2988507603,ES
 2988507604,2988507607,FR
@@ -59982,7 +61284,8 @@
 2988507980,2988507983,DE
 2988507984,2988507999,FR
 2988508000,2988508031,NL
-2988508032,2988508039,PL
+2988508032,2988508035,PL
+2988508036,2988508039,ES
 2988508040,2988508047,FR
 2988508048,2988508055,GB
 2988508056,2988508063,ES
@@ -60004,7 +61307,7 @@
 2988508220,2988508223,DE
 2988508224,2988508287,FR
 2988508288,2988508303,PL
-2988508304,2988508307,CZ
+2988508304,2988508307,PT
 2988508308,2988508315,FR
 2988508316,2988508319,ES
 2988508320,2988508343,FR
@@ -60027,7 +61330,9 @@
 2988508704,2988508711,GB
 2988508712,2988508715,DE
 2988508716,2988508719,GB
-2988508720,2988508847,FR
+2988508720,2988508723,IT
+2988508724,2988508735,GB
+2988508736,2988508847,FR
 2988508848,2988508855,GB
 2988508856,2988508871,FR
 2988508872,2988508875,PL
@@ -60055,7 +61360,7 @@
 2988509280,2988509283,DE
 2988509284,2988509287,IT
 2988509288,2988509291,BE
-2988509292,2988509295,FR
+2988509292,2988509295,GB
 2988509296,2988509311,DE
 2988509312,2988509343,FR
 2988509344,2988509351,BE
@@ -60109,8 +61414,8 @@
 2988509872,2988509903,FR
 2988509904,2988509907,PL
 2988509908,2988509919,IT
-2988509920,2988509931,FR
-2988509932,2988509951,PL
+2988509920,2988509927,FR
+2988509928,2988509951,PL
 2988509952,2988509955,IT
 2988509956,2988509959,PL
 2988509960,2988509963,FR
@@ -60153,8 +61458,7 @@
 2988510760,2988510767,FR
 2988510768,2988510775,ES
 2988510776,2988510847,FR
-2988510848,2988510911,PL
-2988510912,2988510943,FR
+2988510848,2988510943,PL
 2988510944,2988510975,GB
 2988510976,2988510991,PL
 2988510992,2988511007,FR
@@ -60212,11 +61516,12 @@
 2988511936,2988511951,PT
 2988511952,2988511999,GB
 2988512000,2988512031,PL
-2988512032,2988512055,FR
+2988512032,2988512047,FR
+2988512048,2988512055,ES
 2988512056,2988512059,PL
 2988512060,2988512063,FR
 2988512064,2988512095,CH
-2988512096,2988512127,FR
+2988512096,2988512127,IE
 2988512128,2988512143,PL
 2988512144,2988512151,GB
 2988512152,2988512155,ES
@@ -60321,10 +61626,11 @@
 2988513328,2988513331,PL
 2988513332,2988513335,FR
 2988513336,2988513343,GB
-2988513344,2988513351,FR
+2988513344,2988513351,DE
 2988513352,2988513359,IT
 2988513360,2988513375,GB
-2988513376,2988513383,FR
+2988513376,2988513379,FR
+2988513380,2988513383,PT
 2988513384,2988513407,GB
 2988513408,2988513471,PL
 2988513472,2988513503,FR
@@ -60349,7 +61655,8 @@
 2988513724,2988513727,DE
 2988513728,2988513731,FR
 2988513732,2988513735,BE
-2988513736,2988513743,DE
+2988513736,2988513739,FR
+2988513740,2988513743,ES
 2988513744,2988513759,GB
 2988513760,2988513879,FR
 2988513880,2988513883,ES
@@ -60449,7 +61756,9 @@
 2988540220,2988540223,GB
 2988540224,2988540255,BE
 2988540256,2988540271,PL
-2988540272,2988540287,FR
+2988540272,2988540275,DE
+2988540276,2988540279,PL
+2988540280,2988540287,FR
 2988540288,2988540303,BE
 2988540304,2988540319,FR
 2988540320,2988540351,PT
@@ -60516,8 +61825,7 @@
 2988541120,2988541131,FR
 2988541132,2988541135,DE
 2988541136,2988541143,GB
-2988541144,2988541151,IT
-2988541152,2988541215,FR
+2988541144,2988541215,FR
 2988541216,2988541231,PT
 2988541232,2988541235,DE
 2988541236,2988541243,FR
@@ -60539,20 +61847,19 @@
 2988541468,2988541503,FR
 2988541504,2988541519,CH
 2988541520,2988541535,FR
-2988541536,2988541551,GB
+2988541536,2988541539,GB
+2988541540,2988541543,PT
+2988541544,2988541547,FR
+2988541548,2988541551,ES
 2988541552,2988541583,FR
 2988541584,2988541587,ES
-2988541588,2988541591,FR
-2988541592,2988541599,GB
-2988541600,2988541603,FR
+2988541588,2988541603,FR
 2988541604,2988541607,NL
 2988541608,2988541611,GB
 2988541612,2988541615,IT
 2988541616,2988541619,BE
 2988541620,2988541623,CH
-2988541624,2988541631,FR
-2988541632,2988541647,PL
-2988541648,2988541655,FR
+2988541624,2988541655,FR
 2988541656,2988541659,ES
 2988541660,2988541663,PL
 2988541664,2988541679,FR
@@ -60575,9 +61882,13 @@
 2988541784,2988541787,NL
 2988541788,2988541791,FR
 2988541792,2988541807,ES
-2988541808,2988541823,FR
-2988541824,2988541855,LT
-2988541856,2988541887,IE
+2988541808,2988541815,FR
+2988541816,2988541819,DE
+2988541820,2988541823,CZ
+2988541824,2988541855,FR
+2988541856,2988541859,PL
+2988541860,2988541867,GB
+2988541868,2988541887,FR
 2988541888,2988541895,DE
 2988541896,2988541899,PL
 2988541900,2988541903,BE
@@ -60602,7 +61913,10 @@
 2988542056,2988542063,FR
 2988542064,2988542067,GB
 2988542068,2988542071,ES
-2988542072,2988542367,FR
+2988542072,2988542255,FR
+2988542256,2988542271,IT
+2988542272,2988542335,ES
+2988542336,2988542367,FR
 2988542368,2988542399,CZ
 2988542400,2988542407,FR
 2988542408,2988542415,PL
@@ -60647,7 +61961,7 @@
 2988543044,2988543047,ES
 2988543048,2988543051,IE
 2988543052,2988543067,FR
-2988543068,2988543071,GB
+2988543068,2988543071,PL
 2988543072,2988543231,FR
 2988543232,2988543235,IT
 2988543236,2988543243,FR
@@ -60665,8 +61979,8 @@
 2988543316,2988543319,IE
 2988543320,2988543323,FI
 2988543324,2988543327,PL
-2988543328,2988543383,FR
-2988543384,2988543399,DE
+2988543328,2988543379,FR
+2988543380,2988543399,DE
 2988543400,2988543403,GB
 2988543404,2988543407,NL
 2988543408,2988543423,GB
@@ -60682,8 +61996,8 @@
 2988543504,2988543527,FR
 2988543528,2988543535,GB
 2988543536,2988543551,PL
-2988543552,2988543555,GB
-2988543556,2988543559,NL
+2988543552,2988543555,CH
+2988543556,2988543559,BE
 2988543560,2988543563,PT
 2988543564,2988543567,FR
 2988543568,2988543579,PL
@@ -60895,8 +62209,9 @@
 2988547232,2988547239,FR
 2988547240,2988547247,PL
 2988547248,2988547255,NL
-2988547256,2988547271,FR
-2988547272,2988547279,ES
+2988547256,2988547263,FR
+2988547264,2988547267,GB
+2988547268,2988547279,ES
 2988547280,2988547295,FR
 2988547296,2988547303,DE
 2988547304,2988547311,FR
@@ -60919,8 +62234,7 @@
 2988547536,2988547539,FR
 2988547540,2988547543,DE
 2988547544,2988547547,IT
-2988547548,2988547551,PL
-2988547552,2988547567,FR
+2988547548,2988547567,FR
 2988547568,2988547583,DE
 2988547584,2988547599,ES
 2988547600,2988547615,FR
@@ -60955,10 +62269,12 @@
 2988556448,2988556451,NL
 2988556452,2988556479,FR
 2988556480,2988556495,IT
-2988556496,2988556511,FR
-2988556512,2988556543,DE
-2988556544,2988556799,FR
-2988556800,2988556839,DE
+2988556496,2988556527,FR
+2988556528,2988556535,PL
+2988556536,2988556539,GB
+2988556540,2988556543,DE
+2988556544,2988556831,FR
+2988556832,2988556839,DE
 2988556840,2988556847,FR
 2988556848,2988556855,ES
 2988556856,2988556863,GB
@@ -61009,7 +62325,7 @@
 2988557472,2988557487,PL
 2988557488,2988557495,DE
 2988557496,2988557539,PL
-2988557540,2988557543,IE
+2988557540,2988557543,ES
 2988557544,2988557599,FR
 2988557600,2988557631,GB
 2988557632,2988557639,FR
@@ -61033,7 +62349,11 @@
 2988558064,2988558071,IT
 2988558072,2988558075,DE
 2988558076,2988558079,PL
-2988558080,2988558127,FR
+2988558080,2988558083,FR
+2988558084,2988558087,PL
+2988558088,2988558099,FR
+2988558100,2988558103,PL
+2988558104,2988558127,FR
 2988558128,2988558135,PL
 2988558136,2988558139,GB
 2988558140,2988558143,DE
@@ -61045,7 +62365,10 @@
 2988558464,2988558527,NL
 2988558528,2988558591,PL
 2988558592,2988558655,GB
-2988558656,2988558767,FR
+2988558656,2988558727,FR
+2988558728,2988558731,DE
+2988558732,2988558735,PT
+2988558736,2988558767,FR
 2988558768,2988558783,CH
 2988558784,2988558831,FR
 2988558832,2988558847,IT
@@ -61090,7 +62413,12 @@
 2988559736,2988559743,GB
 2988559744,2988559871,FR
 2988559872,2988560383,IT
-2988560384,2988560575,FR
+2988560384,2988560447,FR
+2988560448,2988560451,DE
+2988560452,2988560455,PL
+2988560456,2988560463,FR
+2988560464,2988560479,PL
+2988560480,2988560575,FR
 2988560576,2988560591,ES
 2988560592,2988560595,DE
 2988560596,2988560599,IT
@@ -61121,9 +62449,124 @@
 2988561024,2988561031,ES
 2988561032,2988561039,FR
 2988561040,2988561043,ES
-2988561044,2988561055,FR
-2988561056,2988561071,FI
-2988561072,2988572671,FR
+2988561044,2988561047,FR
+2988561048,2988561051,PL
+2988561052,2988561055,GB
+2988561056,2988561059,FR
+2988561060,2988561071,PL
+2988561072,2988561075,NL
+2988561076,2988561079,IT
+2988561080,2988561083,DE
+2988561084,2988561087,GB
+2988561088,2988561095,FR
+2988561096,2988561099,PL
+2988561100,2988561103,CZ
+2988561104,2988561119,BE
+2988561120,2988561171,FR
+2988561172,2988561175,PL
+2988561176,2988561179,ES
+2988561180,2988561183,PL
+2988561184,2988561199,GB
+2988561200,2988561203,PL
+2988561204,2988561207,GB
+2988561208,2988561215,PL
+2988561216,2988561279,FR
+2988561280,2988561407,NL
+2988561408,2988561667,GB
+2988561668,2988561671,PL
+2988561672,2988561675,NL
+2988561676,2988561679,FI
+2988561680,2988561695,ES
+2988561696,2988561727,FR
+2988561728,2988561743,PL
+2988561744,2988561747,FR
+2988561748,2988561751,PL
+2988561752,2988561759,GB
+2988561760,2988561763,PL
+2988561764,2988561767,DE
+2988561768,2988561775,PL
+2988561776,2988561843,FR
+2988561844,2988561847,IT
+2988561848,2988561855,FR
+2988561856,2988561871,IE
+2988561872,2988561875,CH
+2988561876,2988561887,FR
+2988561888,2988561903,PL
+2988561904,2988561919,IE
+2988561920,2988561983,FR
+2988561984,2988562015,DE
+2988562016,2988562023,PT
+2988562024,2988562027,NL
+2988562028,2988562031,LT
+2988562032,2988562047,PL
+2988562048,2988562079,DE
+2988562080,2988562095,PL
+2988562096,2988562111,IE
+2988562112,2988562127,FR
+2988562128,2988562143,PL
+2988562144,2988562151,FR
+2988562152,2988562159,PL
+2988562160,2988562175,IT
+2988562176,2988562431,NL
+2988562432,2988562591,FR
+2988562592,2988562595,GB
+2988562596,2988562607,FR
+2988562608,2988562611,PT
+2988562612,2988562623,PL
+2988562624,2988562687,FI
+2988562688,2988562703,GB
+2988562704,2988562707,PL
+2988562708,2988562711,DE
+2988562712,2988562719,GB
+2988562720,2988562815,BE
+2988562816,2988562847,FR
+2988562848,2988562855,NL
+2988562856,2988562863,DE
+2988562864,2988562911,FR
+2988562912,2988562943,PL
+2988562944,2988563011,FR
+2988563012,2988563015,PL
+2988563016,2988563023,GB
+2988563024,2988563043,FR
+2988563044,2988563047,ES
+2988563048,2988563055,FR
+2988563056,2988563059,NL
+2988563060,2988563063,CH
+2988563064,2988563067,FI
+2988563068,2988563071,PT
+2988563072,2988563103,DE
+2988563104,2988563135,FR
+2988563136,2988563151,PL
+2988563152,2988563199,FR
+2988563200,2988563455,IE
+2988563456,2988563487,FR
+2988563488,2988563495,GB
+2988563496,2988563503,FR
+2988563504,2988563519,PL
+2988563520,2988563555,FR
+2988563556,2988563559,BE
+2988563560,2988563567,FR
+2988563568,2988563571,NL
+2988563572,2988563575,GB
+2988563576,2988563583,IE
+2988563584,2988563587,DE
+2988563588,2988563591,PT
+2988563592,2988563599,GB
+2988563600,2988563607,ES
+2988563608,2988563615,DE
+2988563616,2988563647,FR
+2988563648,2988563663,LT
+2988563664,2988563667,FR
+2988563668,2988563671,GB
+2988563672,2988563675,FR
+2988563676,2988563679,PL
+2988563680,2988563967,FR
+2988563968,2988563999,BE
+2988564000,2988564019,FR
+2988564020,2988564023,PL
+2988564024,2988564031,FR
+2988564032,2988564063,BE
+2988564064,2988572671,FR
 2988572672,2988703743,RU
 2988703744,2988834815,PL
 2988834816,2988965887,CH
@@ -61135,7 +62578,7 @@
 2989621248,2989752319,BE
 2989752320,2989817855,SY
 2989817856,2989883391,KW
-2989883392,2989916159,UA
+2989883392,2989948927,UA
 2989948928,2990014463,FI
 2990014464,2990079999,PL
 2990080000,2990145535,RU
@@ -61163,7 +62606,11 @@
 2991128576,2991144959,PL
 2991144960,2991161343,SA
 2991161344,2991177727,FR
-2991177728,2991182335,SE
+2991177728,2991177983,DK
+2991177984,2991178239,NL
+2991178240,2991178495,DE
+2991178496,2991178751,RU
+2991178752,2991182335,SE
 2991182336,2991182591,GB
 2991182592,2991185919,SE
 2991185920,2991185951,GB
@@ -61305,7 +62752,8 @@
 2991191632,2991191647,ES
 2991191648,2991191807,SE
 2991191808,2991192063,FI
-2991192064,2991192319,DK
+2991192064,2991192255,DK
+2991192256,2991192319,IT
 2991192320,2991194111,SE
 2991194112,2991210495,NO
 2991210496,2991243263,RU
@@ -61336,9 +62784,7 @@
 2991980808,2991980815,NA
 2991980816,2991981063,UA
 2991981064,2991981071,DE
-2991981072,2991981463,UA
-2991981464,2991981471,NA
-2991981472,2991981495,UA
+2991981072,2991981495,UA
 2991981496,2991981503,NA
 2991981504,2991981647,UA
 2991981648,2991981655,NA
@@ -61356,7 +62802,9 @@
 2991982608,2991982846,JP
 2991982847,2991983359,UA
 2991983360,2991983615,JP
-2991983616,2992111615,UA
+2991983616,2991984383,UA
+2991984384,2991984639,JP
+2991984640,2992111615,UA
 2992111616,2992373759,KZ
 2992373760,2992635903,UA
 2992635904,2993684479,GB
@@ -61427,8 +62875,7 @@
 2996996576,2996996639,DE
 2996996640,2996996767,UA
 2996996768,2996996831,RU
-2996996832,2996996863,DE
-2996996864,2996997119,CN
+2996996832,2996997119,CN
 2996997120,2996998143,DE
 2996998144,2996998271,UA
 2996998272,2996998463,DE
@@ -61443,18 +62890,21 @@
 2996999424,2996999551,IN
 2996999552,2996999679,DE
 2996999680,2996999935,GB
-2996999936,2996999967,DE
+2996999936,2996999951,DE
+2996999952,2996999967,LT
 2996999968,2996999999,AU
 2997000000,2997000447,DE
 2997000448,2997000703,RU
-2997000704,2997000767,DE
+2997000704,2997000735,DE
+2997000736,2997000767,US
 2997000768,2997000831,SC
 2997000832,2997000959,CA
 2997000960,2997000991,DE
 2997000992,2997001119,RO
 2997001120,2997001471,DE
 2997001472,2997001727,BZ
-2997001728,2997003071,DE
+2997001728,2997001983,TR
+2997001984,2997003071,DE
 2997003072,2997003135,RU
 2997003136,2997003199,DE
 2997003200,2997003263,RU
@@ -61509,10 +62959,13 @@
 2997022208,2997022239,DE
 2997022240,2997022303,NL
 2997022304,2997022367,SG
-2997022368,2997022783,DE
+2997022368,2997022751,DE
+2997022752,2997022783,TR
 2997022784,2997022847,IN
 2997022848,2997023231,BZ
-2997023232,2997024255,DE
+2997023232,2997023295,DE
+2997023296,2997023423,IN
+2997023424,2997024255,DE
 2997024256,2997024511,TR
 2997024512,2997026815,DE
 2997026816,2997059583,RU
@@ -61533,7 +62986,9 @@
 2997486912,2997518335,FR
 2997518336,2997528063,RU
 2997528064,2997528319,UA
-2997528320,2997583871,RU
+2997528320,2997549567,RU
+2997549568,2997550079,NL
+2997550080,2997583871,RU
 2997583872,2997616639,SY
 2997616640,2997649407,SI
 2997649408,2997682175,BY
@@ -61556,8 +63011,8 @@
 2999985712,2999985727,BE
 2999985728,2999985743,CZ
 2999985744,2999985759,NL
-2999985760,2999986687,BE
-2999986688,2999992319,NL
+2999985760,2999987967,BE
+2999987968,2999992319,NL
 2999992320,3000000511,RU
 3000000512,3000008703,DE
 3000008704,3000016895,RU
@@ -61737,7 +63192,9 @@
 3001835520,3001839615,RU
 3001839616,3001843711,ES
 3001843712,3001845759,RU
-3001845760,3001851903,GB
+3001845760,3001846271,GB
+3001846272,3001847295,RU
+3001847296,3001851903,GB
 3001851904,3001855999,IT
 3001856000,3001859071,NL
 3001859072,3001860095,MD
@@ -61793,7 +63250,7 @@
 3001975672,3001975679,CN
 3001975680,3001975687,TW
 3001975688,3001975695,US
-3001975696,3001975703,GB
+3001975696,3001975703,UA
 3001975704,3001975711,DE
 3001975712,3001975719,MY
 3001975720,3001975727,US
@@ -61806,12 +63263,15 @@
 3001975824,3001975839,GB
 3001975840,3001975847,CN
 3001975848,3001975855,US
-3001975856,3001975863,GB
+3001975856,3001975863,MY
 3001975864,3001975871,AU
 3001975872,3001975879,US
 3001975880,3001975895,GB
 3001975896,3001975903,RU
-3001975904,3001976415,GB
+3001975904,3001975919,GB
+3001975920,3001975927,US
+3001975928,3001975935,CN
+3001975936,3001976415,GB
 3001976416,3001976447,IL
 3001976448,3001976575,GB
 3001976576,3001976607,US
@@ -61829,11 +63289,12 @@
 3001977088,3001977103,IN
 3001977104,3001977119,RU
 3001977120,3001977135,GB
-3001977136,3001977151,AE
+3001977136,3001977143,CN
+3001977144,3001977151,TW
 3001977152,3001977167,GB
 3001977168,3001977183,LK
 3001977184,3001977199,GB
-3001977200,3001977215,DE
+3001977200,3001977215,SI
 3001977216,3001977247,RU
 3001977248,3001977311,GB
 3001977312,3001977343,CN
@@ -61848,7 +63309,7 @@
 3001977504,3001977519,GB
 3001977520,3001977535,CN
 3001977536,3001977575,GB
-3001977576,3001977583,CA
+3001977576,3001977583,AU
 3001977584,3001977599,GB
 3001977600,3001977855,DK
 3001977856,3001978047,GB
@@ -61860,13 +63321,14 @@
 3001978528,3001978559,UA
 3001978560,3001978591,US
 3001978592,3001978607,AU
-3001978608,3001978623,GB
+3001978608,3001978615,IE
+3001978616,3001978623,CN
 3001978624,3001978687,CA
 3001978688,3001978751,EE
 3001978752,3001978783,RU
 3001978784,3001978815,US
-3001978816,3001978831,LK
-3001978832,3001978847,GB
+3001978816,3001978823,LK
+3001978824,3001978847,GB
 3001978848,3001978879,UA
 3001978880,3001982975,GB
 3001982976,3001987071,CH
@@ -61966,7 +63428,7 @@
 3002699776,3002701823,SE
 3002701824,3002703871,NL
 3002703872,3002705919,DE
-3002705920,3002707967,BG
+3002705920,3002707967,MK
 3002707968,3002710015,KW
 3002710016,3002712063,IT
 3002712064,3002714111,LU
@@ -62050,15 +63512,16 @@
 3003056128,3003058175,DE
 3003058176,3003058431,MT
 3003058432,3003058687,FI
-3003058688,3003058943,EE
-3003058944,3003059135,PH
-3003059136,3003060223,EE
+3003058688,3003058751,EE
+3003058752,3003058943,PH
+3003058944,3003060223,EE
 3003060224,3003062271,DE
 3003062272,3003064319,NL
 3003064320,3003066367,RO
 3003066368,3003066887,PL
 3003066888,3003066895,MX
-3003066896,3003066911,UA
+3003066896,3003066903,RU
+3003066904,3003066911,UA
 3003066912,3003068415,PL
 3003068416,3003070463,NL
 3003070464,3003074559,GB
@@ -62161,7 +63624,7 @@
 3029715456,3029715967,AP
 3029715968,3029716991,JP
 3029716992,3029721087,PK
-3029721088,3029725183,AP
+3029721088,3029725183,AU
 3029725184,3029727231,IN
 3029727232,3029728255,AU
 3029728256,3029729279,HK
@@ -62220,11 +63683,11 @@
 3033268224,3033530367,TW
 3033530368,3033661439,CN
 3033661440,3033694207,KR
+3033694208,3033710591,BD
 3033710592,3033712639,KR
 3033712640,3033714687,SG
 3033714688,3033715711,NZ
 3033716736,3033717759,TH
-3033717760,3033718783,BD
 3033718784,3033726975,CN
 3033726976,3033743359,KR
 3033743360,3033745407,IN
@@ -62294,6 +63757,7 @@
 3035348992,3035357183,AU
 3035365376,3035627519,KR
 3035627520,3036676095,ID
+3036676096,3037724671,AR
 3053453312,3054501887,ID
 3054501888,3054534655,HK
 3054534656,3054537727,PH
@@ -62340,7 +63804,7 @@
 3056762880,3056771071,SG
 3056771072,3056772095,NZ
 3056773120,3056774143,WS
-3056775168,3056779263,AP
+3056775168,3056779263,AF
 3056779264,3056791551,JP
 3056791552,3056795647,ID
 3056795648,3056861183,CN
@@ -62447,7 +63911,6 @@
 3075385344,3075386367,MY
 3075386368,3075387391,AU
 3075387392,3075388415,JP
-3075388416,3075389439,MY
 3075389440,3075390463,IN
 3075390464,3075391487,JP
 3075391488,3075407871,KR
@@ -62606,7 +64069,15 @@
 3093963488,3093963495,IE
 3093963496,3093963599,US
 3093963600,3093963607,CA
-3093963608,3093986367,US
+3093963608,3093965039,US
+3093965040,3093965055,GB
+3093965056,3093965663,US
+3093965664,3093965671,KW
+3093965672,3093965879,US
+3093965880,3093965881,CA
+3093965882,3093965885,US
+3093965886,3093965887,MX
+3093965888,3093986367,US
 3093986368,3093986431,DE
 3093986432,3093986463,US
 3093986464,3093986495,GB
@@ -62693,9 +64164,13 @@
 3132489728,3132555263,AR
 3132620800,3132751871,VE
 3132882944,3132915711,VE
+3132915712,3132948479,PA
 3132948480,3133014015,AR
 3133014016,3133046783,HT
 3133046784,3133054975,AR
+3133063168,3133067263,AR
+3133067264,3133073407,PA
+3133075456,3133079551,AN
 3133079552,3133145087,AR
 3133145088,3145727999,BR
 3145728000,3154116607,MX
@@ -63115,7 +64590,8 @@
 3162365952,3162374143,PL
 3162374144,3162382335,BG
 3162382336,3162390527,RU
-3162390528,3162398719,SE
+3162390528,3162392575,SE
+3162392576,3162398719,A1
 3162398720,3162406911,BE
 3162406912,3162415103,IR
 3162415104,3162423295,DE
@@ -63128,7 +64604,9 @@
 3162472448,3162480639,HU
 3162480640,3162488831,ES
 3162488832,3162497023,FI
-3162497024,3162537983,RU
+3162497024,3162504511,RU
+3162504512,3162504543,PL
+3162504544,3162537983,RU
 3162537984,3162570751,PL
 3162570752,3162603519,HR
 3162603520,3162636287,GE
@@ -63169,7 +64647,9 @@
 3163163872,3163163903,RU
 3163163904,3163163935,GR
 3163163936,3163163967,VG
-3163163968,3163164543,DE
+3163163968,3163164127,DE
+3163164128,3163164159,PK
+3163164160,3163164543,DE
 3163164544,3163164575,RU
 3163164576,3163165759,DE
 3163165760,3163165791,PL
@@ -63213,12 +64693,14 @@
 3163170496,3163170527,BR
 3163170528,3163170591,DE
 3163170592,3163170623,BR
-3163170624,3163171871,DE
+3163170624,3163170655,GR
+3163170656,3163170783,DE
+3163170784,3163170815,PK
+3163170816,3163171871,DE
 3163171872,3163171903,RO
 3163171904,3163172127,DE
 3163172128,3163172159,NL
-3163172160,3163172191,RU
-3163172192,3163172255,DE
+3163172160,3163172255,DE
 3163172256,3163172287,PL
 3163172288,3163172319,DE
 3163172320,3163172351,NL
@@ -63234,7 +64716,9 @@
 3163174080,3163174303,DE
 3163174304,3163174335,IL
 3163174336,3163174367,RU
-3163174368,3163174591,DE
+3163174368,3163174399,DE
+3163174400,3163174431,PK
+3163174432,3163174591,DE
 3163174592,3163174623,SE
 3163174624,3163174655,GB
 3163174656,3163174687,NL
@@ -63245,9 +64729,7 @@
 3163176128,3163176159,NL
 3163176160,3163176255,DE
 3163176256,3163176287,UG
-3163176288,3163176319,DE
-3163176320,3163176351,US
-3163176352,3163176479,DE
+3163176288,3163176479,DE
 3163176480,3163176543,GB
 3163176544,3163176575,DE
 3163176576,3163176607,GR
@@ -63307,9 +64789,11 @@
 3164947456,3164947519,PL
 3164947520,3164947551,ES
 3164947552,3164947583,DE
-3164947584,3164947599,FR
-3164947600,3164947615,GB
-3164947616,3164947627,FR
+3164947584,3164947587,FR
+3164947588,3164947591,PT
+3164947592,3164947615,GB
+3164947616,3164947623,ES
+3164947624,3164947627,GB
 3164947628,3164947635,ES
 3164947636,3164947639,DE
 3164947640,3164947643,IT
@@ -63326,7 +64810,7 @@
 3164948736,3164949087,GB
 3164949088,3164949095,FR
 3164949096,3164949103,IT
-3164949104,3164949119,GB
+3164949104,3164949119,BE
 3164949120,3164949123,PT
 3164949124,3164949131,DE
 3164949132,3164949151,FR
@@ -63347,7 +64831,9 @@
 3164949336,3164949343,IE
 3164949344,3164949359,FR
 3164949360,3164949363,BE
-3164949364,3164949391,FR
+3164949364,3164949371,FR
+3164949372,3164949375,GB
+3164949376,3164949391,FR
 3164949392,3164949395,ES
 3164949396,3164949439,FR
 3164949440,3164949471,PL
@@ -63377,7 +64863,7 @@
 3164950624,3164950655,GB
 3164950656,3164950687,FR
 3164950688,3164950703,ES
-3164950704,3164950719,PL
+3164950704,3164950719,FR
 3164950720,3164950723,GB
 3164950724,3164950735,FR
 3164950736,3164950751,ES
@@ -63404,12 +64890,13 @@
 3164951596,3164951615,FR
 3164951616,3164951663,GB
 3164951664,3164951671,PL
-3164951672,3164951679,FR
+3164951672,3164951675,FR
+3164951676,3164951679,IT
 3164951680,3164951683,ES
 3164951684,3164951687,GB
 3164951688,3164951691,FR
 3164951692,3164951695,CH
-3164951696,3164951711,IE
+3164951696,3164951711,PL
 3164951712,3164951807,FR
 3164951808,3164951823,NL
 3164951824,3164951831,CH
@@ -63543,9 +65030,13 @@
 3164960724,3164960727,DE
 3164960728,3164960735,GB
 3164960736,3164960767,ES
-3164960768,3164960831,PL
-3164960832,3164960895,FR
-3164960896,3164960959,PT
+3164960768,3164960799,GB
+3164960800,3164960831,ES
+3164960832,3164960911,FR
+3164960912,3164960915,PL
+3164960916,3164960919,LT
+3164960920,3164960927,FR
+3164960928,3164960959,GB
 3164960960,3164961023,CH
 3164961024,3164961151,FR
 3164961152,3164961167,DE
@@ -63578,8 +65069,7 @@
 3164961664,3164961695,DE
 3164961696,3164961727,GB
 3164961728,3164961743,ES
-3164961744,3164961759,PL
-3164961760,3164961763,ES
+3164961744,3164961763,PL
 3164961764,3164961767,IT
 3164961768,3164961775,BE
 3164961776,3164961783,FR
@@ -63631,11 +65121,13 @@
 3164962544,3164962623,FR
 3164962624,3164962627,BE
 3164962628,3164962631,PL
-3164962632,3164962655,FR
+3164962632,3164962639,FR
+3164962640,3164962647,ES
+3164962648,3164962655,PT
 3164962656,3164962687,ES
 3164962688,3164962715,FR
 3164962716,3164962719,NL
-3164962720,3164962723,IT
+3164962720,3164962723,FR
 3164962724,3164962727,ES
 3164962728,3164962751,FR
 3164962752,3164964863,ES
@@ -63662,7 +65154,8 @@
 3164967936,3164967967,DE
 3164967968,3164967971,FR
 3164967972,3164967975,DE
-3164967976,3164967999,FR
+3164967976,3164967983,FR
+3164967984,3164967999,PL
 3164968000,3164968063,ES
 3164968064,3164968191,FR
 3164968192,3164968703,PL
@@ -63746,9 +65239,10 @@
 3164970832,3164970835,IT
 3164970836,3164970839,PL
 3164970840,3164970847,GB
-3164970848,3164970855,FR
-3164970856,3164970863,PL
-3164970864,3164970911,FR
+3164970848,3164970883,FR
+3164970884,3164970887,ES
+3164970888,3164970891,IT
+3164970892,3164970911,FR
 3164970912,3164970915,ES
 3164970916,3164970919,FR
 3164970920,3164970923,GB
@@ -63793,7 +65287,8 @@
 3164972480,3164972499,FR
 3164972500,3164972511,DE
 3164972512,3164972527,GB
-3164972528,3164972799,FR
+3164972528,3164972531,DE
+3164972532,3164972799,FR
 3164972800,3164973311,ES
 3164973312,3164973823,FR
 3164973824,3164973855,DE
@@ -63937,9 +65432,7 @@
 3168112640,3168116735,GB
 3168116736,3168120831,RO
 3168120832,3168124927,GB
-3168124928,3168129023,RO
-3168129024,3168137215,GB
-3168137216,3168157695,RO
+3168124928,3168157695,RO
 3168157696,3168178175,GB
 3168178176,3168182271,RO
 3168182272,3168194559,GB
@@ -64028,6 +65521,7 @@
 3187734528,3187736575,BO
 3187736576,3187752959,AR
 3187752960,3187761151,CO
+3187761152,3187769343,AR
 3187769344,3187802111,CO
 3187802112,3187818495,AR
 3187818496,3187822591,PY
@@ -64070,7 +65564,7 @@
 3188211712,3188228095,CL
 3188228096,3188236287,PE
 3188244480,3188260863,CO
-3188260864,3188264959,AR
+3188260864,3188269055,AR
 3188269056,3188273151,VE
 3188273152,3188275199,PA
 3188275200,3188277247,CL
@@ -64268,7 +65762,8 @@
 3194863616,3194871807,HN
 3194880000,3194896383,DO
 3194896384,3194904575,CO
-3194912768,3194929151,CL
+3194912768,3194925055,CL
+3194925056,3194929151,AR
 3194929152,3194937343,EC
 3194945536,3194953727,GT
 3194961920,3194966015,EC
@@ -65532,7 +67027,7 @@
 3227014656,3227014911,FI
 3227014912,3227017215,US
 3227017472,3227017983,DE
-3227018496,3227019007,JP
+3227018752,3227019007,JP
 3227019008,3227020287,US
 3227020288,3227020543,DE
 3227020800,3227022847,US
@@ -65753,7 +67248,8 @@
 3227806720,3227807743,US
 3227807744,3227813375,FI
 3227813376,3227813631,US
-3227813632,3227815167,GB
+3227813632,3227813887,MY
+3227813888,3227815167,GB
 3227815168,3227815935,US
 3227815936,3227816191,GB
 3227816192,3227818495,US
@@ -66349,7 +67845,8 @@
 3230093824,3230094079,NL
 3230094080,3230094335,CA
 3230094336,3230095615,US
-3230095616,3230101503,JP
+3230095616,3230095871,JP
+3230096384,3230101503,JP
 3230101504,3230105855,US
 3230105856,3230106111,PT
 3230106112,3230106879,US
@@ -66958,9 +68455,7 @@
 3231503616,3231503871,IT
 3231503872,3231504383,US
 3231504640,3231504895,GB
-3231504896,3231505407,US
-3231505408,3231505663,JP
-3231505664,3231506687,US
+3231504896,3231506687,US
 3231506688,3231506943,NZ
 3231506944,3231507199,US
 3231507200,3231507455,BE
@@ -67169,7 +68664,8 @@
 3232464896,3232497663,GB
 3232497664,3232555007,US
 3232555264,3232555775,US
-3232555776,3232560895,JP
+3232555776,3232560127,JP
+3232560384,3232560895,JP
 3232560896,3232561663,US
 3232561664,3232561919,CA
 3232561920,3232562431,US
@@ -67986,7 +69482,6 @@
 3237732864,3237733119,DE
 3237733120,3237733631,TH
 3237733632,3237733887,AU
-3237733888,3237734143,NZ
 3237734144,3237734399,CA
 3237734400,3237736447,US
 3237740544,3238002687,US
@@ -68088,6 +69583,7 @@
 3238630656,3238632959,GB
 3238632960,3238633215,UA
 3238633216,3238653951,DK
+3238657536,3238657791,DK
 3238657792,3238658047,AT
 3238658048,3238675455,SE
 3238675456,3238675711,DK
@@ -68250,6 +69746,7 @@
 3239173632,3239173887,AT
 3239173888,3239174143,PL
 3239174144,3239174399,DE
+3239174400,3239174655,RO
 3239174656,3239174911,GB
 3239174912,3239175167,SI
 3239175168,3239175423,UA
@@ -69215,6 +70712,7 @@
 3240741632,3240741887,SK
 3240741888,3240742143,LV
 3240742144,3240742399,IT
+3240742400,3240742655,RO
 3240742656,3240742911,AT
 3240742912,3240743423,IL
 3240743424,3240743935,DK
@@ -69460,6 +70958,7 @@
 3241119488,3241119743,BE
 3241119744,3241119999,RO
 3241120000,3241120255,UA
+3241120256,3241120511,RU
 3241120512,3241120767,GB
 3241120768,3241121023,RU
 3241121024,3241121279,CH
@@ -69563,6 +71062,7 @@
 3241867008,3241867263,FR
 3241867264,3241867519,UA
 3241867520,3241867775,PL
+3241867776,3241868031,NO
 3241868032,3241868287,RU
 3241868288,3241868543,HR
 3241868544,3241868799,DE
@@ -69804,18 +71304,15 @@
 3244823296,3244823551,FR
 3244823552,3244823807,GE
 3244823808,3244824063,RO
-3244824064,3244824319,UA
 3244824320,3244824575,SI
 3244824576,3244824831,RU
 3244824832,3244825087,GB
 3244825088,3244825343,DE
-3244825344,3244825599,UA
 3244825600,3244826111,RU
 3244826112,3244826367,RO
 3244826368,3244826623,CH
 3244826624,3244826879,DE
 3244826880,3244827135,MK
-3244827136,3244827391,RU
 3244827392,3244827647,GB
 3244827648,3244827903,FR
 3244827904,3244828159,BE
@@ -70018,7 +71515,6 @@
 3244883200,3244883455,UA
 3244883456,3244883711,CZ
 3244883712,3244883967,NL
-3244883968,3244884223,UA
 3244884224,3244884479,FR
 3244884480,3244884735,IR
 3244884736,3244884991,NL
@@ -70297,7 +71793,6 @@
 3244999680,3245000703,IQ
 3245000704,3245001727,UA
 3245001728,3245002751,IL
-3245002752,3245003775,ES
 3245003776,3245004799,RU
 3245004800,3245005823,PL
 3245005824,3245006847,UA
@@ -70514,7 +72009,7 @@
 3245175296,3245175551,RU
 3245175552,3245175807,PL
 3245175808,3245176063,GB
-3245176064,3245176319,IT
+3245176064,3245176319,SK
 3245176320,3245176575,UA
 3245176576,3245176831,FR
 3245176832,3245177343,ES
@@ -71609,7 +73104,6 @@
 3249136128,3249137151,RU
 3249137152,3249137663,FR
 3249137664,3249138175,PL
-3249138176,3249138687,UA
 3249139200,3249139711,RU
 3249139712,3249140223,UA
 3249140224,3249140735,IT
@@ -71875,7 +73369,7 @@
 3250425856,3250426111,LT
 3250426112,3250426367,NO
 3250426368,3250426623,AT
-3250426624,3250426879,FR
+3250426624,3250426879,BE
 3250426880,3250427135,JO
 3250427136,3250427391,NL
 3250427392,3250429951,DE
@@ -72174,7 +73668,8 @@
 3251175168,3251175423,UA
 3251175424,3251176703,FR
 3251176704,3251176959,IT
-3251176960,3251177471,FR
+3251176960,3251177215,US
+3251177216,3251177471,FR
 3251177472,3251179519,DE
 3251179520,3251180031,SE
 3251180032,3251180543,PL
@@ -72239,7 +73734,6 @@
 3251209216,3251210239,GB
 3251210240,3251211263,PL
 3251211264,3251212287,UA
-3251212288,3251212415,IE
 3251212416,3251212671,FI
 3251212672,3251212799,SE
 3251212800,3251212927,FR
@@ -72498,8 +73992,7 @@
 3252318720,3252318975,GP
 3252318976,3252319231,PL
 3252319232,3252319743,AT
-3252319744,3252321791,GR
-3252321792,3252322303,DE
+3252319744,3252322303,GR
 3252322304,3252323327,NO
 3252323328,3252324351,PL
 3252324352,3252326399,RU
@@ -72607,20 +74100,21 @@
 3252409104,3252409111,SD
 3252409112,3252409119,LT
 3252409120,3252409127,NG
-3252409128,3252409167,LT
+3252409128,3252409151,LT
+3252409152,3252409159,KE
+3252409160,3252409167,LT
 3252409168,3252409175,UG
 3252409176,3252409183,LT
 3252409184,3252409191,UG
 3252409192,3252409199,ZW
-3252409200,3252409207,TZ
-3252409208,3252409215,LT
+3252409200,3252409215,TZ
 3252409216,3252409223,BW
 3252409224,3252409231,LT
 3252409232,3252409247,UG
-3252409248,3252409263,LT
-3252409264,3252409271,SO
-3252409272,3252409279,LT
-3252409280,3252409343,SO
+3252409248,3252409279,LT
+3252409280,3252409295,SO
+3252409296,3252409303,LT
+3252409304,3252409343,SO
 3252409344,3252409375,TD
 3252409376,3252409407,LT
 3252409408,3252409471,BI
@@ -72634,8 +74128,8 @@
 3252409632,3252409647,AO
 3252409648,3252409727,LT
 3252409728,3252409735,LR
-3252409736,3252410375,LT
-3252410376,3252410391,BW
+3252409736,3252410383,LT
+3252410384,3252410391,BW
 3252410392,3252410431,LT
 3252410432,3252410463,BI
 3252410464,3252410495,LT
@@ -72678,10 +74172,8 @@
 3252415008,3252415015,LT
 3252415016,3252415127,IQ
 3252415128,3252415135,LT
-3252415136,3252415167,IQ
-3252415168,3252415199,LT
-3252415200,3252415231,IQ
-3252415232,3252415487,LT
+3252415136,3252415183,IQ
+3252415184,3252415487,LT
 3252415488,3252415743,IQ
 3252415744,3252415775,GB
 3252415776,3252415967,LT
@@ -72692,8 +74184,8 @@
 3252416960,3252417023,GN
 3252417024,3252417279,LT
 3252417280,3252417287,IQ
-3252417288,3252417375,AF
-3252417376,3252417791,LT
+3252417288,3252417391,AF
+3252417392,3252417791,LT
 3252417792,3252417855,NG
 3252417856,3252417919,LT
 3252417920,3252417935,MW
@@ -72732,8 +74224,8 @@
 3252419920,3252419927,IQ
 3252419928,3252419935,LT
 3252419936,3252419951,IQ
-3252419952,3252419991,LT
-3252419992,3252420007,IQ
+3252419952,3252419999,LT
+3252420000,3252420007,IQ
 3252420008,3252420031,LT
 3252420032,3252420055,IQ
 3252420056,3252420063,LT
@@ -72762,9 +74254,7 @@
 3252424736,3252424767,MA
 3252424768,3252424799,LT
 3252424800,3252424815,NE
-3252424816,3252424959,LT
-3252424960,3252424967,KE
-3252424968,3252425023,LT
+3252424816,3252425023,LT
 3252425024,3252425215,SO
 3252425216,3252425343,TD
 3252425344,3252425471,LT
@@ -72890,8 +74380,12 @@
 3252450912,3252451071,LT
 3252451072,3252451327,CH
 3252451328,3252451583,LT
-3252451584,3252451599,GM
-3252451600,3252451839,LT
+3252451584,3252451607,GM
+3252451608,3252451631,GW
+3252451632,3252451655,GN
+3252451656,3252451679,SL
+3252451680,3252451695,LR
+3252451696,3252451839,LT
 3252451840,3252451855,NO
 3252451856,3252451967,LT
 3252451968,3252451999,NO
@@ -73434,7 +74928,9 @@
 3254490368,3254490623,CF
 3254490624,3254491135,FR
 3254491136,3254491391,DZ
-3254491392,3254491607,GQ
+3254491392,3254491531,GQ
+3254491532,3254491603,FR
+3254491604,3254491607,GQ
 3254491608,3254491615,FR
 3254491616,3254491647,GQ
 3254491648,3254491903,FR
@@ -73582,6 +75078,7 @@
 3254784512,3254785279,LT
 3254785280,3254785535,KZ
 3254785536,3254785791,DK
+3254785792,3254786047,LU
 3254796288,3254797311,SE
 3254797312,3254798335,RU
 3254798336,3254799359,AT
@@ -73940,7 +75437,9 @@
 3255252528,3255252543,LU
 3255252544,3255252559,BE
 3255252560,3255252575,LU
-3255252576,3255255559,BE
+3255252576,3255254847,BE
+3255254848,3255254879,LU
+3255254880,3255255559,BE
 3255255560,3255255567,LU
 3255255568,3255255599,BE
 3255255600,3255255607,LU
@@ -73960,7 +75459,9 @@
 3255260320,3255260335,LU
 3255260336,3255260343,BE
 3255260344,3255260347,LU
-3255260348,3255261519,BE
+3255260348,3255261471,BE
+3255261472,3255261503,LU
+3255261504,3255261519,BE
 3255261520,3255261535,LU
 3255261536,3255262799,BE
 3255262800,3255262815,LU
@@ -75641,6 +77142,7 @@
 3258085888,3258086143,UA
 3258086144,3258086399,AT
 3258086400,3258086655,UA
+3258086656,3258086911,PL
 3258086912,3258087167,GB
 3258087168,3258087423,UA
 3258087424,3258087679,RU
@@ -76333,7 +77835,6 @@
 3261820928,3261821183,RO
 3261821184,3261821439,AT
 3261821440,3261821695,NL
-3261821696,3261821951,SI
 3261821952,3261822207,RU
 3261822208,3261822463,UA
 3261822464,3261822719,GB
@@ -80024,6 +81525,7 @@
 3264847360,3264847487,FR
 3264847488,3264847615,RU
 3264847616,3264847679,PL
+3264847680,3264847743,FI
 3264847744,3264847807,BE
 3264847808,3264847871,SE
 3264847872,3264849919,DE
@@ -80033,7 +81535,7 @@
 3264850944,3264851967,IT
 3264851968,3264854015,CH
 3264854016,3264854527,DE
-3264854528,3264854783,RU
+3264854528,3264854783,CZ
 3264854784,3264855039,IT
 3264855040,3264855551,CH
 3264855552,3264856063,DE
@@ -80402,7 +81904,6 @@
 3265918976,3265919231,NL
 3265919232,3265919487,FR
 3265919488,3265919743,RU
-3265919744,3265919999,DK
 3265920000,3265920255,CZ
 3265920256,3265920511,TR
 3265920512,3265921023,GB
@@ -81171,9 +82672,7 @@
 3268238360,3268238367,DE
 3268238368,3268238463,GB
 3268238464,3268238471,DE
-3268238472,3268238759,GB
-3268238760,3268238767,EU
-3268238768,3268238847,GB
+3268238472,3268238847,GB
 3268238848,3268239103,EU
 3268239104,3268239359,GB
 3268239360,3268239583,EU
@@ -81897,6 +83396,33 @@
 3270973952,3270974463,FR
 3270974464,3270974975,IT
 3270974976,3270975487,NL
+3270975488,3270975743,RU
+3270975744,3270975999,UA
+3270976000,3270976255,FR
+3270976256,3270976511,UA
+3270976512,3270976767,HU
+3270976768,3270977023,UA
+3270977024,3270977279,NL
+3270977280,3270977535,RS
+3270977536,3270977791,RU
+3270977792,3270978047,PL
+3270978048,3270978303,UA
+3270978304,3270979071,FI
+3270979072,3270979327,PL
+3270979328,3270979583,AT
+3270979584,3270979839,LV
+3270980096,3270980351,AM
+3270980352,3270980607,RU
+3270980608,3270980863,MD
+3270980864,3270981631,RU
+3270981632,3270981887,IT
+3270981888,3270982143,DE
+3270982144,3270982399,RU
+3270982400,3270982655,TR
+3270982656,3270982911,UA
+3270982912,3270983167,DK
+3270983168,3270983423,PL
+3270983424,3270983679,NL
 3270983680,3270991871,GB
 3270991872,3271000063,NL
 3271000064,3271008255,RU
@@ -82862,6 +84388,14 @@
 3272899072,3272899583,GB
 3272899584,3272900095,UA
 3272900096,3272900607,LV
+3272900608,3272900863,RU
+3272900864,3272901119,AT
+3272901120,3272901375,UA
+3272901376,3272901631,PL
+3272901632,3272901887,AT
+3272901888,3272902143,DE
+3272902144,3272902399,PL
+3272902400,3272902655,RU
 3272908800,3272910847,SK
 3272910848,3272911359,NL
 3272911360,3272911871,SK
@@ -83090,7 +84624,6 @@
 3273025536,3273026559,RU
 3273027584,3273028607,UA
 3273028608,3273029631,PL
-3273029632,3273030655,DK
 3273030656,3273031679,PL
 3273031680,3273032191,GB
 3273032192,3273033215,UA
@@ -84240,7 +85773,9 @@
 3275371776,3275372031,TJ
 3275372032,3275374591,RU
 3275374592,3275382783,GB
-3275382784,3275390975,SE
+3275382784,3275382887,SE
+3275382888,3275382891,NO
+3275382892,3275390975,SE
 3275390976,3275399167,GB
 3275399168,3275407359,AT
 3275407360,3275415551,GB
@@ -84249,11 +85784,11 @@
 3275423752,3275423775,EU
 3275423776,3275423807,GB
 3275423808,3275423871,EU
-3275423872,3275424255,GB
-3275424256,3275425791,EU
-3275425792,3275426687,GB
-3275426688,3275426815,EU
-3275426816,3275427271,GB
+3275423872,3275424271,GB
+3275424272,3275424319,EU
+3275424320,3275424447,GB
+3275424448,3275425791,EU
+3275425792,3275427271,GB
 3275427272,3275427279,EU
 3275427280,3275427583,GB
 3275427584,3275427839,EU
@@ -84279,9 +85814,7 @@
 3275442720,3275444223,EU
 3275444224,3275444735,GB
 3275444736,3275446271,EU
-3275446272,3275446991,GB
-3275446992,3275447007,EU
-3275447008,3275447039,GB
+3275446272,3275447039,GB
 3275447040,3275448319,EU
 3275448320,3275449519,GB
 3275449520,3275449527,FR
@@ -84293,10 +85826,10 @@
 3275454128,3275454143,EU
 3275454144,3275454263,GB
 3275454264,3275454271,EU
-3275454272,3275454367,GB
-3275454368,3275454463,EU
-3275454464,3275456415,GB
-3275456416,3275456511,EU
+3275454272,3275454383,GB
+3275454384,3275454463,EU
+3275454464,3275456447,GB
+3275456448,3275456511,EU
 3275456512,3275457023,GB
 3275457024,3275457791,FK
 3275457792,3275458559,GB
@@ -84304,7 +85837,9 @@
 3275460096,3275460607,EU
 3275460608,3275460863,HK
 3275460864,3275463523,GB
-3275463524,3275463679,EU
+3275463524,3275463535,EU
+3275463536,3275463551,GB
+3275463552,3275463679,EU
 3275463680,3275464031,GB
 3275464032,3275464047,IE
 3275464048,3275468655,GB
@@ -84335,7 +85870,7 @@
 3275510016,3275510079,SE
 3275510080,3275510143,ES
 3275510208,3275510271,SE
-3275510272,3275510399,IE
+3275510336,3275510399,IE
 3275510400,3275510463,NL
 3275510464,3275510527,GB
 3275510528,3275510559,PL
@@ -84625,7 +86160,6 @@
 3275789312,3275789823,UA
 3275789824,3275790335,PL
 3275790336,3275790847,MD
-3275790848,3275791359,DK
 3275791360,3275791871,RU
 3275791872,3275792383,PL
 3275792384,3275792895,BG
@@ -84778,7 +86312,9 @@
 3276014472,3276014495,GB
 3276014496,3276014887,FR
 3276014888,3276014895,IE
-3276014896,3276015103,FR
+3276014896,3276014951,FR
+3276014952,3276014959,GB
+3276014960,3276015103,FR
 3276015104,3276015119,GB
 3276015120,3276015199,FR
 3276015200,3276015231,GB
@@ -84873,11 +86409,11 @@
 3276019928,3276020367,FR
 3276020368,3276020383,GB
 3276020384,3276020399,FR
-3276020400,3276020423,GB
-3276020424,3276020431,FR
+3276020400,3276020415,GB
+3276020416,3276020431,FR
 3276020432,3276020439,GB
-3276020440,3276020495,FR
-3276020496,3276020511,GB
+3276020440,3276020503,FR
+3276020504,3276020511,GB
 3276020512,3276020559,FR
 3276020560,3276020567,GB
 3276020568,3276020623,FR
@@ -84892,9 +86428,7 @@
 3276020944,3276020991,GB
 3276020992,3276021591,FR
 3276021592,3276021599,GB
-3276021600,3276021863,FR
-3276021864,3276021871,GB
-3276021872,3276022039,FR
+3276021600,3276022039,FR
 3276022040,3276022047,GB
 3276022048,3276022087,FR
 3276022088,3276022095,GB
@@ -85107,8 +86641,8 @@
 3276033232,3276033247,FR
 3276033248,3276033279,GB
 3276033280,3276033535,FR
-3276033536,3276033647,GB
-3276033648,3276033663,FR
+3276033536,3276033655,GB
+3276033656,3276033663,FR
 3276033664,3276033695,GB
 3276033696,3276033791,FR
 3276033792,3276033823,GB
@@ -85268,8 +86802,8 @@
 3276045024,3276045039,GB
 3276045040,3276045063,FR
 3276045064,3276045071,GB
-3276045072,3276045119,FR
-3276045120,3276045127,GB
+3276045072,3276045111,FR
+3276045112,3276045127,GB
 3276045128,3276045135,FR
 3276045136,3276045151,GB
 3276045152,3276045191,FR
@@ -87467,7 +89001,7 @@
 3276425472,3276425727,DE
 3276425728,3276425983,RU
 3276425984,3276426239,IT
-3276426240,3276426751,DK
+3276426496,3276426751,DK
 3276426752,3276427007,RO
 3276427008,3276427263,PL
 3276427264,3276427519,FR
@@ -87540,8 +89074,8 @@
 3276479352,3276479615,FR
 3276479616,3276479647,EU
 3276479648,3276479743,FR
-3276479744,3276480015,EU
-3276480016,3276480095,FR
+3276479744,3276479999,EU
+3276480000,3276480095,FR
 3276480096,3276480111,EU
 3276480112,3276480159,FR
 3276480160,3276480191,EU
@@ -87641,8 +89175,8 @@
 3276500000,3276500031,CH
 3276500032,3276500095,DE
 3276500096,3276500127,EU
-3276500128,3276500159,DE
-3276500160,3276500479,EU
+3276500128,3276500223,DE
+3276500224,3276500479,EU
 3276500480,3276500735,DE
 3276500736,3276500991,EU
 3276500992,3276501023,DE
@@ -87956,13 +89490,12 @@
 3276697088,3276697599,GB
 3276697600,3276698111,UA
 3276698112,3276699647,RU
-3276700160,3276700671,UA
 3276700672,3276701183,RO
 3276701184,3276701695,RU
 3276701696,3276709887,SE
 3276709888,3276718079,DE
 3276718080,3276726271,IT
-3276726272,3276727295,DE
+3276726272,3276727295,PK
 3276727296,3276728319,ES
 3276728320,3276729343,UA
 3276729344,3276730367,PL
@@ -88391,7 +89924,9 @@
 3276873728,3276874351,ES
 3276874352,3276874367,GB
 3276874368,3276874751,ES
-3276874752,3276875775,NL
+3276874752,3276875007,NL
+3276875008,3276875263,CH
+3276875264,3276875775,NL
 3276875776,3276876031,GB
 3276876032,3276876287,DK
 3276876288,3276876799,GB
@@ -88407,18 +89942,22 @@
 3276877824,3276877831,BG
 3276877832,3276878079,GB
 3276878080,3276878335,BG
-3276878336,3276879359,GB
+3276878336,3276879103,GB
+3276879104,3276879359,ES
 3276879360,3276879423,TR
 3276879424,3276879615,GB
 3276879616,3276879871,TR
 3276879872,3276880639,DK
-3276880640,3276881919,GB
+3276880640,3276881663,GB
+3276881664,3276881919,FR
 3276881920,3276883391,IT
 3276883392,3276883455,GB
 3276883456,3276883839,IT
 3276883840,3276883967,GB
 3276883968,3276884487,PL
-3276884488,3276886015,GB
+3276884488,3276884735,GB
+3276884736,3276884991,PL
+3276884992,3276886015,GB
 3276886016,3276886271,RO
 3276886272,3276887167,GB
 3276887168,3276888063,DE
@@ -88444,15 +89983,16 @@
 3276896896,3276896927,BE
 3276896928,3276897023,GB
 3276897024,3276897279,BE
-3276897280,3276898303,GB
+3276897280,3276898047,GB
+3276898048,3276898303,CZ
 3276898304,3276898775,CH
 3276898776,3276898783,GB
 3276898784,3276900039,CH
 3276900040,3276900047,GB
 3276900048,3276900351,CH
 3276900352,3276900607,GB
-3276900608,3276900799,CH
-3276900800,3276900863,GB
+3276900608,3276900815,CH
+3276900816,3276900863,GB
 3276900864,3276901119,CH
 3276901120,3276901375,GB
 3276901376,3276901391,CH
@@ -88463,8 +90003,8 @@
 3276902176,3276902207,GB
 3276902208,3276902271,CH
 3276902272,3276902399,GB
-3276902400,3276902575,SE
-3276902576,3276902655,GB
+3276902400,3276902583,SE
+3276902584,3276902655,GB
 3276902656,3276903422,SE
 3276903423,3276903423,GB
 3276903424,3276903935,SE
@@ -88478,18 +90018,18 @@
 3276906004,3276906239,GB
 3276906240,3276906279,SE
 3276906280,3276906495,GB
-3276906496,3276906863,NL
-3276906864,3276906879,GB
-3276906880,3276907551,NL
+3276906496,3276907551,NL
 3276907552,3276907775,GB
 3276907776,3276908159,NL
 3276908160,3276908287,GB
 3276908288,3276908543,NL
-3276908544,3276910079,GB
-3276910080,3276910591,NL
+3276908544,3276909823,GB
+3276909824,3276910591,NL
 3276910592,3276910967,IT
 3276910968,3276910975,GB
-3276910976,3276912615,IT
+3276910976,3276911615,IT
+3276911616,3276911871,GB
+3276911872,3276912615,IT
 3276912616,3276912623,GB
 3276912624,3276913183,IT
 3276913184,3276913215,GB
@@ -88515,8 +90055,8 @@
 3276921240,3276921247,GB
 3276921248,3276921279,DE
 3276921280,3276921295,GB
-3276921296,3276921303,DE
-3276921304,3276921399,GB
+3276921296,3276921335,DE
+3276921336,3276921399,GB
 3276921400,3276921403,DK
 3276921404,3276921599,GB
 3276921600,3276921607,DE
@@ -88525,12 +90065,10 @@
 3276922624,3276923431,FR
 3276923432,3276923439,GB
 3276923440,3276924071,FR
-3276924072,3276924095,GB
-3276924096,3276924351,FR
+3276924072,3276924079,GB
+3276924080,3276924351,FR
 3276924352,3276924415,GB
-3276924416,3276925951,FR
-3276925952,3276926207,GB
-3276926208,3276926735,FR
+3276924416,3276926735,FR
 3276926736,3276931071,GB
 3276931072,3276939263,KZ
 3276939264,3276955647,DE
@@ -88871,7 +90409,6 @@
 3277823744,3277823999,UA
 3277824000,3277824255,TR
 3277824256,3277824511,SI
-3277824512,3277824767,UA
 3277824768,3277825023,AT
 3277825024,3277825279,PL
 3277825280,3277825535,UA
@@ -90862,8 +92399,7 @@
 3278944016,3278944016,PL
 3278944017,3278944017,DE
 3278944018,3278944018,BE
-3278944019,3278944019,FR
-3278944020,3278944020,DE
+3278944019,3278944020,DE
 3278944021,3278944021,IT
 3278944022,3278944022,FR
 3278944023,3278944023,AT
@@ -91744,7 +93280,9 @@
 3279601664,3279609855,CZ
 3279609856,3279618047,RU
 3279618048,3279683583,UA
-3279683584,3279752959,DE
+3279683584,3279744391,DE
+3279744392,3279744399,PL
+3279744400,3279752959,DE
 3279752960,3279753215,CH
 3279753216,3279897583,DE
 3279897584,3279897591,GB
@@ -91761,7 +93299,7 @@
 3279958016,3279972351,RU
 3279972352,3279974399,AT
 3279974400,3279976447,PL
-3279976448,3279986687,RU
+3279976448,3279978495,RU
 3279986688,3279987199,NL
 3279987200,3279987711,RU
 3279987712,3279988223,RO
@@ -92741,7 +94279,9 @@
 3280954496,3280955391,GB
 3280955392,3280955419,DE
 3280955420,3280955423,GB
-3280955424,3280955791,DE
+3280955424,3280955519,DE
+3280955520,3280955647,GB
+3280955648,3280955791,DE
 3280955792,3280955799,GB
 3280955800,3280956143,DE
 3280956144,3280956415,GB
@@ -93506,8 +95046,8 @@
 3280993200,3280993215,DE
 3280993216,3280993247,GB
 3280993248,3280993263,DE
-3280993264,3280993535,GB
-3280993536,3280994303,DE
+3280993264,3280993791,GB
+3280993792,3280994303,DE
 3280994304,3280994559,GB
 3280994560,3280994815,RU
 3280994816,3280995071,NL
@@ -93873,7 +95413,6 @@
 3282743040,3282743295,CH
 3282743296,3282743551,CY
 3282743552,3282743807,SI
-3282743808,3282744063,MD
 3282744064,3282744319,UA
 3282744320,3282744575,SA
 3282744576,3282744831,LT
@@ -95287,12 +96826,9 @@
 3285467960,3285467967,EU
 3285467968,3285468511,DE
 3285468512,3285468575,EU
-3285468576,3285468591,DE
-3285468592,3285468599,EU
-3285468600,3285468615,DE
+3285468576,3285468615,DE
 3285468616,3285468623,GB
-3285468624,3285468639,EU
-3285468640,3285469695,DE
+3285468624,3285469695,DE
 3285469696,3285469727,EU
 3285469728,3285471007,DE
 3285471008,3285471039,EU
@@ -95337,8 +96873,8 @@
 3285474320,3285474335,EU
 3285474336,3285474815,DE
 3285474816,3285475071,EU
-3285475072,3285475127,DE
-3285475128,3285475143,EU
+3285475072,3285475135,DE
+3285475136,3285475143,EU
 3285475144,3285475167,DE
 3285475168,3285475199,EU
 3285475200,3285475207,DE
@@ -96439,7 +97975,8 @@
 3285910304,3285910335,GB
 3285910336,3285910399,ES
 3285910400,3285910407,IT
-3285910408,3285910463,GB
+3285910408,3285910431,GB
+3285910432,3285910463,EU
 3285910464,3285910527,ES
 3285910528,3285911551,GB
 3285911552,3285912575,EU
@@ -96467,7 +98004,8 @@
 3285919488,3285919743,UA
 3285919744,3285921791,QA
 3285921792,3285921823,CZ
-3285921824,3285921919,EU
+3285921824,3285921855,GB
+3285921856,3285921919,EU
 3285921920,3285921983,GB
 3285921984,3285922111,EU
 3285922112,3285922175,FR
@@ -96551,11 +98089,11 @@
 3285942784,3285943039,ES
 3285943040,3285943295,SE
 3285943296,3285943551,ES
-3285943552,3285943559,DK
-3285943560,3285943567,EU
+3285943552,3285943567,EU
 3285943568,3285943575,ES
 3285943576,3285943583,DE
-3285943584,3285943679,EU
+3285943584,3285943615,GB
+3285943616,3285943679,EU
 3285943680,3285943807,GB
 3285943808,3285944319,EU
 3285944320,3285944831,US
@@ -97532,9 +99070,7 @@
 3288401152,3288401407,RU
 3288401408,3288401663,SA
 3288401664,3288401919,MU
-3288401920,3288403711,ZA
-3288403712,3288403967,MU
-3288403968,3288406527,ZA
+3288401920,3288406527,ZA
 3288406528,3288407039,KE
 3288407040,3288408063,NA
 3288408064,3288413183,ZA
@@ -97925,6 +99461,7 @@
 3302535168,3302536191,UG
 3302536192,3302537215,GH
 3302537216,3302538239,NG
+3302538240,3302539263,GH
 3302552576,3302552831,TZ
 3302552832,3302553087,KE
 3302553088,3302553343,EG
@@ -97949,6 +99486,7 @@
 3302753616,3302760447,NG
 3302760448,3302768639,ZA
 3302768640,3302776831,NG
+3302776832,3302785023,ZW
 3302809600,3302817791,NG
 3302817792,3302883327,EG
 3302883328,3302948863,MA
@@ -97970,18 +99508,23 @@
 3302953728,3302953983,AO
 3302953984,3302954239,SD
 3302954240,3302954495,KE
-3302987264,3302987775,MU
 3305111552,3307208703,TN
+3311403008,3311927295,ZA
 3313500160,3313762303,MA
+3313762304,3314024447,EG
+3314024448,3314286591,KE
+3314286592,3314548735,DZ
 3315597312,3316121599,EG
 3316121600,3316645887,ZA
 3316645888,3317170175,KE
 3317694464,3318218751,EG
 3318218752,3318743039,DZ
 3319791616,3320053759,MU
-3320053760,3320315903,ZA
 3320578048,3320643583,ZA
-3321886720,3321888767,MU
+3320643584,3320709119,KE
+3321823232,3321839615,NG
+3321839616,3321855999,GH
+3321886720,3321887743,MU
 3321954304,3321970687,US
 3322019840,3322023935,US
 3322023936,3322028031,CL
@@ -98444,8 +99987,8 @@
 3333012992,3333029887,CA
 3333029888,3333212415,US
 3333212416,3333212927,A1
-3333212928,3333213119,US
-3333213120,3333213439,A1
+3333212928,3333213055,US
+3333213056,3333213439,A1
 3333213440,3333213695,US
 3333213696,3333214079,A1
 3333214080,3333385983,US
@@ -98690,17 +100233,25 @@
 3339179008,3339180031,US
 3339180032,3339181055,CA
 3339181056,3339184127,US
-3339184128,3339186175,CA
+3339184128,3339184639,CA
+3339184640,3339184895,US
+3339184896,3339186175,CA
 3339186176,3339669503,US
 3339669504,3339671807,CA
 3339672576,3339673599,US
 3339681792,3339747327,US
-3339747328,3339748351,CA
+3339747328,3339747583,CA
+3339747584,3339747839,FR
+3339747840,3339748351,CA
 3339748352,3339753471,US
 3339753472,3339754495,CA
 3339754496,3339760639,US
 3339760640,3339761663,CA
-3339761664,3339923455,US
+3339761664,3339778303,US
+3339778304,3339778367,GB
+3339778368,3339778431,US
+3339778432,3339778495,CY
+3339778496,3339923455,US
 3339923456,3339927551,CA
 3339943936,3339952127,US
 3339952128,3339956223,CA
@@ -98885,14 +100436,20 @@
 3342526464,3342528511,CA
 3342528512,3342548991,US
 3342565376,3342567423,CA
-3342567424,3342578687,US
+3342567424,3342579711,US
 3342579712,3342581759,CA
+3342581760,3342595071,US
+3342595072,3342596095,CA
+3342596096,3342598143,US
 3342598144,3342603263,CA
 3342603264,3342604799,US
 3342604800,3342605311,CA
 3342605312,3342605567,US
 3342605568,3342663679,CA
-3342663680,3343319295,US
+3342663680,3343007743,US
+3343024128,3343055871,US
+3343055872,3343056895,CA
+3343056896,3343319295,US
 3343319296,3343364095,CA
 3343364096,3343365119,US
 3343365632,3343372543,CA
@@ -99692,7 +101249,9 @@
 3356379648,3356380159,AR
 3356380160,3356380927,CL
 3356380928,3356381183,DO
-3356381184,3356389375,CL
+3356381184,3356381439,CL
+3356381440,3356381695,PA
+3356382208,3356389375,CL
 3356389376,3356389887,CO
 3356389888,3356391423,CL
 3356391424,3356393471,CO
@@ -99708,7 +101267,10 @@
 3356499968,3356508159,MX
 3356508160,3356514303,AR
 3356514304,3356514559,US
-3356516352,3356557311,AR
+3356516352,3356520447,AR
+3356520448,3356521471,CL
+3356521472,3356521727,AR
+3356522496,3356557311,AR
 3356557312,3356819455,BR
 3356819456,3356884991,CO
 3356884992,3356950527,CL
@@ -100601,6 +102163,7 @@
 3389016576,3389017087,AU
 3389017088,3389017343,JP
 3389017344,3389017855,HK
+3389017856,3389018111,VN
 3389018112,3389018367,PG
 3389018368,3389018623,ID
 3389018624,3389019135,AU
@@ -100832,7 +102395,7 @@
 3389532160,3389533183,SG
 3389533184,3389534207,NZ
 3389534208,3389538303,JP
-3389538304,3389541375,TH
+3389538304,3389540351,TH
 3389541632,3389541887,JP
 3389541888,3389542399,TH
 3389542400,3389543423,JP
@@ -100859,7 +102422,7 @@
 3389607424,3389607679,AU
 3389607680,3389608191,VN
 3389608192,3389608447,TH
-3389608448,3389608703,AP
+3389608448,3389608703,HK
 3389608704,3389608959,AU
 3389608960,3389609215,VN
 3389609216,3389609471,ID
@@ -101245,7 +102808,8 @@
 3392143360,3392208895,JP
 3392208896,3392286975,NZ
 3392286976,3392287231,US
-3392287232,3392295935,NZ
+3392287232,3392287743,NZ
+3392288768,3392295935,NZ
 3392295936,3392296191,AU
 3392296192,3392339967,NZ
 3392339968,3392340991,NP
@@ -101363,7 +102927,7 @@
 3392670848,3392671743,HK
 3392671744,3392675839,JP
 3392675840,3392681983,NZ
-3392681984,3392682239,AP
+3392681984,3392682239,SG
 3392682240,3392682495,VN
 3392682496,3392683007,IN
 3392683008,3392684031,AU
@@ -101430,7 +102994,7 @@
 3392922624,3392922879,IN
 3392922880,3392923135,AU
 3392923136,3392923391,BN
-3392923392,3392923647,AP
+3392923392,3392923647,IN
 3392923648,3392924159,CN
 3392924160,3392924671,JP
 3392924672,3392924927,PH
@@ -101865,7 +103429,7 @@
 3394838528,3394846719,NZ
 3394846720,3394850815,IN
 3394850816,3394854911,JP
-3394855936,3394856959,AP
+3394855936,3394856959,AU
 3394856960,3394859007,IN
 3394859008,3394860031,JP
 3394860032,3394860543,ID
@@ -101965,6 +103529,23 @@
 3395166208,3395170303,AU
 3395170304,3395174399,JP
 3395174400,3395174911,AU
+3395174912,3395175167,NP
+3395175168,3395175679,IN
+3395175680,3395175935,AU
+3395175936,3395176191,SG
+3395176192,3395176703,AU
+3395176704,3395176959,TH
+3395176960,3395177215,IN
+3395177216,3395177471,HK
+3395177472,3395177983,TH
+3395177984,3395178495,AU
+3395178496,3395178751,ID
+3395178752,3395179007,MH
+3395179008,3395179263,VN
+3395179264,3395180031,ID
+3395180032,3395180287,JP
+3395180288,3395180543,HK
+3395180544,3395181055,VN
 3395182592,3395190783,SG
 3395190784,3395198975,JP
 3395198976,3395203071,MY
@@ -103255,7 +104836,7 @@
 3406961152,3406961407,IN
 3406961408,3406967295,AU
 3406967296,3406967551,CN
-3406967552,3406989567,AU
+3406967808,3406989567,AU
 3406989568,3406989823,IN
 3406989824,3407020287,AU
 3407020288,3407020543,SG
@@ -104001,8 +105582,7 @@
 3413587968,3413588223,NZ
 3413588224,3413588479,MY
 3413588480,3413593087,VN
-3413593088,3413593343,AU
-3413593344,3413593599,AP
+3413593088,3413593599,AU
 3413593600,3413593855,SG
 3413593856,3413594111,KH
 3413594112,3413595135,CN
@@ -104012,7 +105592,7 @@
 3413595904,3413596159,HK
 3413596160,3413596671,AP
 3413596672,3413597183,NP
-3413597184,3413597695,AP
+3413597184,3413597695,AU
 3413597696,3413597951,TW
 3413597952,3413602303,AU
 3413639168,3413704703,SG
@@ -104108,7 +105688,7 @@
 3414667264,3414669311,ID
 3414669312,3414670335,AU
 3414670336,3414670591,IN
-3414670592,3414670847,AP
+3414670592,3414670847,SG
 3414670848,3414671359,MY
 3414671360,3415080959,JP
 3415080960,3415083007,MY
@@ -104242,7 +105822,7 @@
 3416338688,3416339967,SG
 3416339968,3416342527,IN
 3416342528,3416371199,AU
-3416371200,3416371711,AP
+3416371200,3416371711,PH
 3416371712,3416371967,VN
 3416371968,3416372223,IN
 3416372224,3416372479,CN
@@ -105312,9 +106892,7 @@
 3420437504,3420438527,IN
 3420438528,3420454911,HK
 3420454912,3422552063,KR
-3422552064,3422717439,US
-3422717440,3422717695,A1
-3422717696,3422848511,US
+3422552064,3422848511,US
 3422848512,3422848767,GB
 3422848768,3422955519,US
 3422955520,3422956799,FR
@@ -105716,7 +107294,7 @@
 3423584736,3423584751,CA
 3423584752,3423584767,US
 3423584768,3423585535,CA
-3423585536,3423585551,IR
+3423585536,3423585551,MY
 3423585552,3423585631,CA
 3423585632,3423585647,US
 3423585648,3423585775,CA
@@ -105735,7 +107313,7 @@
 3423586016,3423586031,US
 3423586032,3423586039,NZ
 3423586040,3423586159,CA
-3423586160,3423586167,IR
+3423586160,3423586167,MY
 3423586168,3423586303,CA
 3423586304,3423589151,US
 3423589152,3423589159,GB
@@ -106378,18 +107956,26 @@
 3432572800,3432572927,DO
 3432572928,3432585215,US
 3432585216,3432585727,MX
-3432586240,3432660991,US
+3432586240,3432613631,US
+3432613632,3432613887,CA
+3432613888,3432634111,US
+3432634112,3432634367,CA
+3432634368,3432660991,US
 3432660992,3432662527,DE
 3432662528,3432662531,PT
 3432662532,3432663039,DE
-3432663040,3432806655,US
+3432663040,3432689151,US
+3432689152,3432689663,CA
+3432689664,3432807423,US
 3432807424,3432808447,CA
 3432808448,3433581312,US
 3433581313,3433581567,CA
 3433581568,3433955327,US
 3433955328,3433981951,CA
 3433981952,3433983999,US
-3433984000,3434020863,CA
+3433984000,3434014719,CA
+3434014720,3434015231,US
+3434015232,3434020863,CA
 3434020864,3434096063,US
 3434096064,3434096079,AU
 3434096080,3434097919,US
@@ -106444,17 +108030,19 @@
 3434917376,3434917887,AG
 3434917888,3435069439,US
 3435069440,3435134975,CA
-3435134976,3435507711,US
+3435134976,3435271423,US
+3435271424,3435271679,CA
+3435271680,3435507711,US
 3435507712,3435511807,CA
-3435511808,3436249087,US
-3436249088,3436255743,CA
+3435511808,3436249343,US
+3436249344,3436255743,CA
 3436255744,3436256255,US
 3436256256,3436282367,CA
 3436282368,3436282623,US
 3436282624,3436289791,CA
 3436289792,3436290047,US
-3436290048,3436314623,CA
-3436314624,3436476415,US
+3436290048,3436314367,CA
+3436314368,3436476415,US
 3436476416,3436478463,AW
 3436478464,3436492799,US
 3436492800,3436493055,NL
@@ -107772,9 +109360,7 @@
 3456303104,3456311295,JP
 3456311296,3456892927,US
 3456892928,3456958463,CA
-3456958464,3457040383,US
-3457040384,3457040639,A1
-3457040640,3457246367,US
+3456958464,3457246367,US
 3457246368,3457246383,SE
 3457246384,3457312191,US
 3457312192,3457312255,IE
@@ -109251,7 +110837,9 @@
 3470150656,3470150911,CA
 3470150912,3470151935,US
 3470151936,3470152703,CA
-3470152704,3470153983,US
+3470152704,3470152959,US
+3470152960,3470152975,CA
+3470152976,3470153983,US
 3470153984,3470154239,CA
 3470154240,3470184454,US
 3470184455,3470184458,LK
@@ -109935,8 +111523,7 @@
 3470659488,3470659519,IL
 3470659520,3470659567,US
 3470659568,3470659575,BR
-3470659576,3470659583,DE
-3470659584,3470659711,US
+3470659576,3470659711,US
 3470659712,3470659719,BD
 3470659720,3470659735,US
 3470659736,3470659743,AU
@@ -110203,7 +111790,9 @@
 3476451376,3476455423,CA
 3476455424,3476718616,US
 3476718617,3476718617,IN
-3476718618,3476720363,US
+3476718618,3476720125,US
+3476720126,3476720126,GB
+3476720127,3476720363,US
 3476720364,3476720367,LV
 3476720368,3476720377,US
 3476720378,3476720381,PT
@@ -110238,7 +111827,9 @@
 3476722776,3476722783,GB
 3476722784,3476723263,US
 3476723264,3476723271,NL
-3476723272,3476725183,US
+3476723272,3476723670,US
+3476723671,3476723674,GB
+3476723675,3476725183,US
 3476725184,3476725215,ZA
 3476725216,3476725247,US
 3476725248,3476725255,CA
@@ -110262,9 +111853,7 @@
 3477161552,3477161567,TN
 3477161568,3477161615,US
 3477161616,3477161623,TN
-3477161624,3477161631,US
-3477161632,3477161663,TN
-3477161664,3477161775,US
+3477161624,3477161775,US
 3477161776,3477161791,TN
 3477161792,3477311871,US
 3477311872,3477312255,A1
@@ -110487,7 +112076,9 @@
 3480256512,3480284159,US
 3480284160,3480284671,CA
 3480284672,3480444927,US
-3480444928,3480446335,CA
+3480444928,3480446231,CA
+3480446232,3480446239,US
+3480446240,3480446335,CA
 3480446336,3480446463,US
 3480446464,3480446575,CA
 3480446576,3480446583,ES
@@ -110687,9 +112278,7 @@
 3482775552,3482778375,PR
 3482778376,3482778383,US
 3482778384,3482779647,PR
-3482779648,3482864191,US
-3482864192,3482864255,A1
-3482864256,3482910719,US
+3482779648,3482910719,US
 3482910720,3482927103,CA
 3482927104,3483296004,US
 3483296005,3483296005,BE
@@ -110722,7 +112311,11 @@
 3483877376,3483893759,CA
 3483893760,3484013055,US
 3484013056,3484013567,DE
-3484013568,3484450815,US
+3484013568,3484438527,US
+3484438528,3484438783,ZM
+3484438784,3484439551,US
+3484439552,3484439807,ZM
+3484439808,3484450815,US
 3484450816,3484451839,CA
 3484451840,3484451871,US
 3484451872,3484455263,CA
@@ -111402,9 +112995,7 @@
 3493141280,3493141311,CY
 3493141312,3493244927,US
 3493244928,3493249023,PR
-3493249024,3493728959,US
-3493728960,3493728991,A2
-3493728992,3493866495,US
+3493249024,3493866495,US
 3493866496,3493867519,VG
 3493867520,3493874687,US
 3493874688,3493875711,BM
@@ -111539,9 +113130,7 @@
 3494197605,3494197614,US
 3494197615,3494197617,CA
 3494197618,3494197632,US
-3494197633,3494197684,CA
-3494197685,3494197694,US
-3494197695,3494197760,CA
+3494197633,3494197760,CA
 3494197761,3494197777,AE
 3494197778,3494197953,CA
 3494197954,3494197967,US
@@ -111653,7 +113242,23 @@
 3494380544,3494381567,CA
 3494381568,3494409215,US
 3494410240,3494412287,CA
-3494412288,3494418951,US
+3494412288,3494418511,US
+3494418512,3494418527,GB
+3494418528,3494418575,US
+3494418576,3494418591,AU
+3494418592,3494418623,CA
+3494418624,3494418631,BE
+3494418632,3494418639,US
+3494418640,3494418655,AU
+3494418656,3494418711,US
+3494418712,3494418719,CO
+3494418720,3494418727,AU
+3494418728,3494418735,US
+3494418736,3494418743,NZ
+3494418744,3494418855,US
+3494418856,3494418863,GR
+3494418864,3494418871,CA
+3494418872,3494418951,US
 3494418952,3494418959,CA
 3494418960,3494419007,US
 3494419008,3494419039,ID
@@ -111946,7 +113551,13 @@
 3495153664,3495155711,CA
 3495155712,3495157039,US
 3495157040,3495157047,SE
-3495157048,3495164239,US
+3495157048,3495159807,US
+3495159808,3495159815,ES
+3495159816,3495159839,US
+3495159840,3495159847,BR
+3495159848,3495161599,US
+3495161600,3495161855,BR
+3495161856,3495164239,US
 3495164240,3495164247,CA
 3495164248,3495190527,US
 3495192576,3495193599,CA
@@ -112197,9 +113808,13 @@
 3495862272,3495864319,CA
 3495864320,3495864831,DM
 3495864832,3495865343,GP
-3495865344,3495865599,CA
+3495865344,3495865439,CA
+3495865440,3495865471,BD
+3495865472,3495865599,CA
 3495865600,3495865631,BD
-3495865632,3495866207,CA
+3495865632,3495866047,CA
+3495866048,3495866079,US
+3495866080,3495866207,CA
 3495866208,3495866239,BD
 3495866240,3495866359,CA
 3495866360,3495866363,US
@@ -112420,7 +114035,13 @@
 3497156864,3497156879,NL
 3497156880,3497156983,US
 3497156984,3497157006,DZ
-3497157007,3497161607,US
+3497157007,3497160191,US
+3497160192,3497160351,NL
+3497160352,3497161215,US
+3497161216,3497161343,HK
+3497161344,3497161375,US
+3497161376,3497161407,HK
+3497161408,3497161607,US
 3497161608,3497161615,NO
 3497161616,3497161703,US
 3497161704,3497161711,GB
@@ -112437,7 +114058,18 @@
 3497161920,3497161927,US
 3497161928,3497161935,GB
 3497161936,3497161943,MT
-3497161944,3497163311,US
+3497161944,3497162495,US
+3497162496,3497162751,GB
+3497162752,3497163007,NL
+3497163008,3497163039,US
+3497163040,3497163047,ES
+3497163048,3497163103,US
+3497163104,3497163111,NO
+3497163112,3497163135,US
+3497163136,3497163151,GB
+3497163152,3497163167,US
+3497163168,3497163175,GB
+3497163176,3497163311,US
 3497163312,3497163319,NO
 3497163320,3497163351,US
 3497163352,3497163359,ES
@@ -112454,9 +114086,14 @@
 3497163664,3497163679,DK
 3497163680,3497163695,US
 3497163696,3497163703,DK
-3497163704,3497164287,US
+3497163704,3497163711,ES
+3497163712,3497164287,US
 3497164288,3497164295,GB
-3497164296,3497164799,US
+3497164296,3497164463,US
+3497164464,3497164479,ES
+3497164480,3497164487,US
+3497164488,3497164495,ES
+3497164496,3497164799,US
 3497164800,3497181183,CA
 3497181184,3497226295,US
 3497226296,3497226303,SG
@@ -112564,7 +114201,10 @@
 3500016384,3500016639,KN
 3500016640,3500016895,AG
 3500016896,3500017151,DM
-3500017152,3500019711,AG
+3500017152,3500018943,AG
+3500018944,3500019199,LC
+3500019200,3500019455,AG
+3500019456,3500019711,LC
 3500019712,3500076415,US
 3500076416,3500076543,SG
 3500076544,3500126207,US
@@ -113556,9 +115196,7 @@
 3509775649,3509775664,CA
 3509775665,3509775792,US
 3509775793,3509775870,CA
-3509775871,3509775871,US
-3509775872,3509775879,RU
-3509775880,3509775903,US
+3509775871,3509775903,US
 3509775904,3509775919,AU
 3509775920,3509775943,US
 3509775944,3509775951,IT
@@ -113698,7 +115336,11 @@
 3510327296,3510328319,AG
 3510328320,3510328575,KN
 3510328576,3510328831,MS
-3510328832,3510329599,AG
+3510328832,3510329279,AG
+3510329280,3510329295,MS
+3510329296,3510329303,AG
+3510329304,3510329311,MS
+3510329312,3510329599,AG
 3510329600,3510329855,MS
 3510329856,3510331391,AG
 3510331392,3510332415,DM
@@ -114853,7 +116495,7 @@
 3515456704,3515456767,JP
 3515456768,3515596799,US
 3515596800,3515613183,CA
-3515744256,3515793351,US
+3515613184,3515793351,US
 3515793352,3515793359,MO
 3515793360,3515867151,US
 3515867152,3515867167,AU
@@ -114898,8 +116540,7 @@
 3516355664,3516355679,CA
 3516355680,3516357631,US
 3516357632,3516357887,MY
-3516357888,3516358143,US
-3516358144,3516358399,CA
+3516357888,3516358399,CA
 3516358400,3516366847,US
 3516366848,3516370943,CA
 3516370944,3516514303,US
@@ -115235,8 +116876,8 @@
 3517523184,3517523671,US
 3517523672,3517523679,KY
 3517523680,3517523935,US
-3517523936,3517523951,BZ
-3517523952,3517524175,US
+3517523936,3517523943,BZ
+3517523944,3517524175,US
 3517524176,3517524183,GT
 3517524184,3517524191,VI
 3517524192,3517524431,US
@@ -115249,7 +116890,9 @@
 3517597184,3517597695,US
 3517597696,3517598207,SE
 3517598208,3517598463,IE
-3517598464,3517598591,SE
+3517598464,3517598527,SE
+3517598528,3517598559,FR
+3517598560,3517598591,SE
 3517598592,3517599231,US
 3517599232,3517599263,BG
 3517599264,3517600767,SE
@@ -115483,7 +117126,9 @@
 3519412800,3519412815,RU
 3519412816,3519413759,US
 3519413760,3519414271,CA
-3519414272,3519417087,US
+3519414272,3519417071,US
+3519417072,3519417075,PT
+3519417076,3519417087,US
 3519417088,3519417151,IT
 3519417152,3519417183,DE
 3519417184,3519420767,US
@@ -115922,14 +117567,17 @@
 3520999424,3521003519,CA
 3521003520,3521003583,US
 3521003584,3521003647,IL
-3521003648,3521007103,US
-3521007104,3521007111,IN
-3521007112,3521011743,US
+3521003648,3521011719,US
+3521011720,3521011727,BR
+3521011728,3521011735,AU
+3521011736,3521011743,US
 3521011744,3521011751,PK
-3521011752,3521011759,GB
-3521011760,3521011791,US
-3521011792,3521011799,CA
-3521011800,3521011967,US
+3521011752,3521011759,US
+3521011760,3521011767,GB
+3521011768,3521011791,US
+3521011792,3521011799,NZ
+3521011800,3521011807,BR
+3521011808,3521011967,US
 3521011968,3521011975,IL
 3521011976,3521013559,US
 3521013560,3521013567,GB
@@ -115938,7 +117586,13 @@
 3521013960,3521014127,US
 3521014128,3521014135,GR
 3521014136,3521014143,CA
-3521014144,3521028095,US
+3521014144,3521014655,US
+3521014656,3521014671,HK
+3521014672,3521014687,US
+3521014688,3521014703,GB
+3521014704,3521018495,US
+3521018496,3521018511,IN
+3521018512,3521028095,US
 3521028096,3521032191,CA
 3521032192,3521044479,US
 3521044480,3521048575,CA
@@ -116067,7 +117721,9 @@
 3522121216,3522121471,US
 3522121472,3522121983,LY
 3522121984,3522122239,AW
-3522122240,3522131711,US
+3522122240,3522131615,US
+3522131616,3522131647,BR
+3522131648,3522131711,US
 3522131712,3522131743,GB
 3522131744,3522131775,DE
 3522131776,3522131807,BR
@@ -116079,7 +117735,9 @@
 3522132640,3522132671,BO
 3522132672,3522132703,BR
 3522132704,3522132735,LK
-3522132736,3522133599,US
+3522132736,3522133023,US
+3522133024,3522133055,BR
+3522133056,3522133599,US
 3522133600,3522133631,JP
 3522133632,3522133639,US
 3522133640,3522133647,DE
@@ -116111,7 +117769,9 @@
 3523297280,3523317759,PH
 3523317760,3523330047,JP
 3523330048,3523338239,AU
+3523338240,3523340287,MY
 3523340288,3523341311,AP
+3523341312,3523342335,JP
 3523342336,3523346431,BD
 3523346432,3523354623,CN
 3523354624,3523362815,KR
@@ -116397,6 +118057,7 @@
 3528396800,3528400895,AU
 3528400896,3528404991,JP
 3528404992,3528407039,NZ
+3528407040,3528409087,AU
 3528409088,3528425471,CN
 3528425472,3528445951,JP
 3528445952,3528450047,ID
@@ -116476,7 +118137,7 @@
 3536945152,3536977919,TW
 3536977920,3537010687,IN
 3537010688,3537027071,ID
-3537027072,3537043455,KR
+3537027072,3537047551,KR
 3537047552,3537049599,ID
 3537049600,3537051647,HK
 3537051648,3537059839,JP
@@ -116495,7 +118156,8 @@
 3539337216,3539353599,NZ
 3539353600,3539402751,TH
 3539402752,3539435519,JP
-3539435520,3539468287,AU
+3539435520,3539464191,AU
+3539464192,3539468287,ID
 3539468288,3541303295,JP
 3541303296,3541565439,TW
 3541565440,3541696511,MY
@@ -116544,17 +118206,18 @@
 3556974592,3556982783,ES
 3556982784,3556984623,DE
 3556984624,3556984639,FR
-3556984640,3556990975,DE
+3556984640,3556985663,DE
+3556985664,3556985671,HU
+3556985672,3556990975,DE
 3556990976,3556999167,UA
 3556999168,3557007359,RU
-3557007360,3557015551,GB
 3557015552,3557023743,DE
 3557023744,3557023879,BE
 3557023880,3557023903,GB
 3557023904,3557023999,BE
 3557024000,3557024255,GB
-3557024256,3557025279,BE
-3557025280,3557025791,GB
+3557024256,3557024767,BE
+3557024768,3557025791,GB
 3557025792,3557026047,BE
 3557026048,3557026303,GB
 3557026304,3557026815,BE
@@ -116640,7 +118303,9 @@
 3557244928,3557253119,IT
 3557253120,3557261311,RU
 3557261312,3557277695,DE
-3557277696,3557280334,NL
+3557277696,3557278710,NL
+3557278711,3557278714,CH
+3557278715,3557280334,NL
 3557280335,3557280336,IN
 3557280337,3557285887,NL
 3557285888,3557294079,RU
@@ -116658,8 +118323,8 @@
 3557336320,3557336575,EU
 3557336576,3557336655,BE
 3557336656,3557336703,EU
-3557336704,3557336767,BE
-3557336768,3557338111,EU
+3557336704,3557336831,BE
+3557336832,3557338111,EU
 3557338112,3557338367,BE
 3557338368,3557338495,EU
 3557338496,3557339175,BE
@@ -116667,8 +118332,10 @@
 3557339184,3557339199,BE
 3557339200,3557339215,EU
 3557339216,3557339223,BE
-3557339224,3557339231,EU
-3557339232,3557339267,BE
+3557339224,3557339239,EU
+3557339240,3557339247,BE
+3557339248,3557339255,EU
+3557339256,3557339267,BE
 3557339268,3557339271,EU
 3557339272,3557340159,BE
 3557340160,3557340191,EU
@@ -116747,8 +118414,8 @@
 3557363656,3557363663,JE
 3557363664,3557363671,GB
 3557363672,3557363679,JE
-3557363680,3557363687,GB
-3557363688,3557363783,JE
+3557363680,3557363695,GB
+3557363696,3557363783,JE
 3557363784,3557363791,GB
 3557363792,3557364223,JE
 3557364224,3557364479,GB
@@ -116871,7 +118538,9 @@
 3557851136,3557859327,HU
 3557859328,3557860831,SE
 3557860832,3557860847,FI
-3557860848,3557867519,SE
+3557860848,3557860863,SE
+3557860864,3557861119,NO
+3557861120,3557867519,SE
 3557867520,3557875711,RU
 3557875712,3557883903,DE
 3557883904,3557892095,RU
@@ -116999,9 +118668,7 @@
 3558288488,3558288639,US
 3558288640,3558288671,BE
 3558288672,3558288687,DE
-3558288688,3558288703,BE
-3558288704,3558288719,GB
-3558288720,3558288895,BE
+3558288688,3558288895,BE
 3558288896,3558289111,FR
 3558289112,3558289119,GB
 3558289120,3558289151,FR
@@ -117046,11 +118713,11 @@
 3558292544,3558292607,GB
 3558292608,3558292735,NL
 3558292736,3558292863,GB
-3558292864,3558293143,NL
+3558292864,3558292871,CH
+3558292872,3558293119,NL
+3558293120,3558293143,CH
 3558293144,3558293151,GB
-3558293152,3558293199,NL
-3558293200,3558293247,GB
-3558293248,3558293503,NL
+3558293152,3558293503,NL
 3558293504,3558301695,RU
 3558301696,3558310319,DE
 3558310320,3558310327,CH
@@ -117419,8 +119086,7 @@
 3559089608,3559089611,GB
 3559089612,3559089623,BE
 3559089624,3559089627,GB
-3559089628,3559089631,BE
-3559089632,3559089639,FR
+3559089628,3559089639,BE
 3559089640,3559089643,GB
 3559089644,3559089655,BE
 3559089656,3559089659,GB
@@ -117456,7 +119122,9 @@
 3559090924,3559090927,GB
 3559090928,3559091011,BE
 3559091012,3559091015,GB
-3559091016,3559091087,BE
+3559091016,3559091063,BE
+3559091064,3559091071,GB
+3559091072,3559091087,BE
 3559091088,3559091091,GB
 3559091092,3559091159,BE
 3559091160,3559091167,GB
@@ -117697,8 +119365,7 @@
 3559490624,3559490687,NL
 3559490688,3559490719,ES
 3559490720,3559490751,NL
-3559490752,3559490783,ES
-3559490784,3559490791,CH
+3559490752,3559490791,ES
 3559490792,3559490799,BE
 3559490800,3559491135,NL
 3559491136,3559491199,ES
@@ -117710,8 +119377,7 @@
 3559491648,3559491711,ES
 3559491712,3559491727,NL
 3559491728,3559491735,ES
-3559491736,3559491839,NL
-3559491840,3559491871,ES
+3559491736,3559491871,NL
 3559491872,3559491903,GB
 3559491904,3559491967,ES
 3559491968,3559492003,NL
@@ -117720,9 +119386,7 @@
 3559492014,3559492015,ES
 3559492016,3559492023,NL
 3559492024,3559492031,ES
-3559492032,3559493151,NL
-3559493152,3559493167,ES
-3559493168,3559493247,NL
+3559492032,3559493247,NL
 3559493248,3559493279,ES
 3559493280,3559493311,GB
 3559493312,3559493349,NL
@@ -117851,16 +119515,16 @@
 3559902208,3559902975,UA
 3559902976,3559903231,EE
 3559903232,3559903487,UA
-3559903488,3559903551,EE
-3559903552,3559903743,UA
+3559903488,3559903615,EE
+3559903616,3559903743,UA
 3559903744,3559904023,EE
 3559904024,3559904255,UA
 3559904256,3559904511,EE
-3559904512,3559904607,UA
-3559904608,3559904639,EE
-3559904640,3559905019,UA
+3559904512,3559905019,UA
 3559905020,3559905031,EE
-3559905032,3559905055,UA
+3559905032,3559905047,UA
+3559905048,3559905051,EE
+3559905052,3559905055,UA
 3559905056,3559905139,EE
 3559905140,3559905143,DE
 3559905144,3559905151,UA
@@ -117870,7 +119534,9 @@
 3559905226,3559905231,UA
 3559905232,3559905247,EE
 3559905248,3559905255,UA
-3559905256,3559905297,EE
+3559905256,3559905263,EE
+3559905264,3559905271,UA
+3559905272,3559905297,EE
 3559905298,3559905299,UA
 3559905300,3559905317,EE
 3559905318,3559905319,LT
@@ -117878,9 +119544,9 @@
 3559905324,3559905535,UA
 3559905536,3559905623,EE
 3559905624,3559905631,UA
-3559905632,3559905975,EE
-3559905976,3559905983,UA
-3559905984,3559906257,EE
+3559905632,3559905903,EE
+3559905904,3559905911,UA
+3559905912,3559906257,EE
 3559906258,3559906259,UA
 3559906260,3559906799,EE
 3559906800,3559906815,UA
@@ -117997,9 +119663,7 @@
 3560710144,3560718335,CH
 3560718336,3560726527,GM
 3560726528,3560734719,DK
-3560734720,3560742623,DE
-3560742624,3560742631,GB
-3560742632,3560742911,DE
+3560734720,3560742911,DE
 3560742912,3560751103,AT
 3560751104,3560767487,DE
 3560767488,3560832791,NL
@@ -118310,9 +119974,7 @@
 3560940996,3560940999,DK
 3560941000,3560941003,ES
 3560941004,3560941007,PL
-3560941008,3560941011,DE
-3560941012,3560941015,FR
-3560941016,3560941019,DE
+3560941008,3560941019,DE
 3560941020,3560941023,IT
 3560941024,3560941027,FR
 3560941028,3560941031,CH
@@ -120114,7 +121776,9 @@
 3561201664,3561206655,NL
 3561206656,3561206663,BE
 3561206664,3561209855,NL
-3561209856,3561218047,GB
+3561209856,3561214975,GB
+3561214976,3561215230,ES
+3561215231,3561218047,GB
 3561218048,3561226239,AT
 3561226240,3561234431,FI
 3561234432,3561242623,TR
@@ -120240,8 +121904,8 @@
 3561607344,3561607359,GB
 3561607360,3561607679,FR
 3561607680,3561607711,GB
-3561607712,3561607727,FR
-3561607728,3561607775,GB
+3561607712,3561607759,FR
+3561607760,3561607775,GB
 3561607776,3561610239,FR
 3561610240,3561610495,US
 3561610496,3561610527,FR
@@ -120267,7 +121931,8 @@
 3561616896,3561616959,FR
 3561616960,3561617151,GB
 3561617152,3561617407,FR
-3561617408,3561617919,CH
+3561617408,3561617663,FI
+3561617664,3561617919,LU
 3561617920,3561618175,SE
 3561618176,3561618431,IE
 3561618432,3561618687,DK
@@ -120298,7 +121963,8 @@
 3561783296,3561799679,RU
 3561799680,3561807871,DE
 3561807872,3561816063,BE
-3561816064,3561824255,VA
+3561816064,3561823999,VA
+3561824000,3561824255,IT
 3561824256,3561832447,LI
 3561832448,3561840639,IT
 3561840640,3561848831,PL
@@ -120400,7 +122066,9 @@
 3561975808,3561979903,UA
 3561979904,3561988095,ES
 3561988096,3562004479,DE
-3562004480,3562012671,NL
+3562004480,3562010495,NL
+3562010496,3562010623,DE
+3562010624,3562012671,NL
 3562012672,3562020095,IR
 3562020096,3562020351,AE
 3562020352,3562020863,IR
@@ -120722,7 +122390,8 @@
 3563006592,3563006719,CA
 3563006720,3563006729,DE
 3563006730,3563006847,CN
-3563006848,3563007487,DE
+3563006848,3563006911,US
+3563006912,3563007487,DE
 3563007488,3563007999,TR
 3563008000,3563008255,DE
 3563008256,3563008511,PL
@@ -121063,9 +122732,15 @@
 3564153088,3564153151,NO
 3564153152,3564153199,SE
 3564153200,3564153207,NL
-3564153208,3564157207,SE
+3564153208,3564156415,SE
+3564156416,3564156419,NO
+3564156420,3564156919,SE
+3564156920,3564156927,FI
+3564156928,3564157207,SE
 3564157208,3564157215,NO
-3564157216,3564158975,SE
+3564157216,3564158951,SE
+3564158952,3564158955,NO
+3564158956,3564158975,SE
 3564158976,3564161855,DE
 3564161856,3564161891,NL
 3564161892,3564165119,DE
@@ -121360,8 +123035,8 @@
 3564566528,3564567047,GB
 3564567048,3564567055,US
 3564567056,3564567079,GB
-3564567080,3564567087,US
-3564567088,3564567143,GB
+3564567080,3564567095,US
+3564567096,3564567143,GB
 3564567144,3564567151,US
 3564567152,3564567183,GB
 3564567184,3564567199,US
@@ -121727,8 +123402,8 @@
 3564953744,3564953744,GB
 3564953745,3564953759,AT
 3564953760,3564953791,GB
-3564953792,3564953855,AT
-3564953856,3564954111,GB
+3564953792,3564953919,AT
+3564953920,3564954111,GB
 3564954112,3564954131,AT
 3564954132,3564954139,GB
 3564954140,3564954143,AT
@@ -123816,9 +125491,7 @@
 3574161108,3574161111,NL
 3574161112,3574161335,DE
 3574161336,3574161339,AI
-3574161340,3574161391,DE
-3574161392,3574161395,NO
-3574161396,3574169599,DE
+3574161340,3574169599,DE
 3574169600,3574202367,ES
 3574202368,3574267903,NL
 3574267904,3574333439,FR
@@ -123865,7 +125538,8 @@
 3574693888,3574726655,PL
 3574726656,3574792191,GB
 3574792192,3574824959,CZ
-3574824960,3574825279,GB
+3574824960,3574825023,NL
+3574825024,3574825279,GB
 3574825280,3574825407,NL
 3574825408,3574825471,GB
 3574825472,3574826111,NL
@@ -123921,9 +125595,7 @@
 3575360200,3575360207,FR
 3575360208,3575367111,ES
 3575367112,3575367119,DE
-3575367120,3575372159,ES
-3575372160,3575372167,GB
-3575372168,3575372239,ES
+3575367120,3575372239,ES
 3575372240,3575372247,PT
 3575372248,3575382015,ES
 3575382016,3575412991,FI
@@ -125093,7 +126765,9 @@
 3576260272,3576260287,GB
 3576260288,3576260303,FR
 3576260304,3576260335,GB
-3576260336,3576260463,FR
+3576260336,3576260415,FR
+3576260416,3576260447,GB
+3576260448,3576260463,FR
 3576260464,3576260543,GB
 3576260544,3576260559,FR
 3576260560,3576260607,GB
@@ -125219,12 +126893,10 @@
 3576987648,3577001983,GB
 3577001984,3577003583,NL
 3577003584,3577003711,GB
-3577003712,3577003727,NL
-3577003728,3577003735,GB
-3577003736,3577003767,NL
+3577003712,3577003767,NL
 3577003768,3577003771,GB
-3577003772,3577003775,NL
-3577003776,3577020415,GB
+3577003772,3577004031,NL
+3577004032,3577020415,GB
 3577020416,3577085951,NL
 3577085952,3577151487,DE
 3577151488,3577167871,FR
@@ -125247,9 +126919,13 @@
 3577546240,3577546367,US
 3577546368,3577547455,DE
 3577547456,3577547519,FR
-3577547520,3577551407,DE
+3577547520,3577550983,DE
+3577550984,3577550991,CH
+3577550992,3577551407,DE
 3577551408,3577551411,US
-3577551412,3577557215,DE
+3577551412,3577553599,DE
+3577553600,3577553607,DK
+3577553608,3577557215,DE
 3577557216,3577557231,US
 3577557232,3577559775,DE
 3577559776,3577559783,FR
@@ -125259,15 +126935,11 @@
 3577567712,3577567719,IT
 3577567720,3577577231,DE
 3577577232,3577577247,US
-3577577248,3577580887,DE
-3577580888,3577580895,DK
-3577580896,3577592431,DE
+3577577248,3577592431,DE
 3577592432,3577592447,FR
 3577592448,3577592743,DE
 3577592744,3577592751,IE
-3577592752,3577606599,DE
-3577606600,3577606607,GB
-3577606608,3577608743,DE
+3577592752,3577608743,DE
 3577608744,3577608751,ES
 3577608752,3577610367,DE
 3577610368,3577610495,GB
@@ -125328,8 +127000,7 @@
 3577625600,3577625823,EU
 3577625824,3577625839,GB
 3577625840,3577625855,DE
-3577625856,3577626367,GB
-3577626368,3577626623,EU
+3577625856,3577626623,GB
 3577626624,3577627135,FR
 3577627136,3577627391,EU
 3577627392,3577627647,GB
@@ -125370,9 +127041,7 @@
 3577640720,3577640735,EU
 3577640736,3577641151,FR
 3577641152,3577641159,EU
-3577641160,3577641175,FR
-3577641176,3577641183,EU
-3577641184,3577641199,FR
+3577641160,3577641199,FR
 3577641200,3577641215,EU
 3577641216,3577641391,FR
 3577641392,3577641399,EU
@@ -125536,8 +127205,8 @@
 3579188416,3579188431,IS
 3579188432,3579191759,GB
 3579191760,3579191775,DE
-3579191776,3579193599,GB
-3579193600,3579193703,NL
+3579191776,3579193615,GB
+3579193616,3579193703,NL
 3579193704,3579193704,GB
 3579193705,3579193705,NL
 3579193706,3579193711,GB
@@ -125816,9 +127485,14 @@
 3580252672,3580254207,EE
 3580254208,3580260351,DE
 3580260352,3580265727,AT
-3580265728,3580338175,SE
+3580265728,3580268543,SE
+3580268544,3580272639,LV
+3580272640,3580338175,SE
 3580338176,3580339199,HR
-3580339200,3580362751,SE
+3580339200,3580340223,SE
+3580340224,3580344319,LT
+3580344320,3580354559,SE
+3580354560,3580362751,LT
 3580362752,3580473375,GB
 3580473376,3580473391,IE
 3580473392,3580473503,GB
@@ -125967,7 +127641,9 @@
 3582091264,3582099455,QA
 3582099456,3582107647,GB
 3582107648,3582115839,NL
-3582115840,3582116863,SE
+3582115840,3582116095,SE
+3582116096,3582116351,EE
+3582116352,3582116863,SE
 3582116864,3582117887,EE
 3582117888,3582119423,LT
 3582119424,3582120959,SE
@@ -126012,9 +127688,13 @@
 3582222864,3582222879,NO
 3582222880,3582223087,SE
 3582223088,3582223095,NL
-3582223096,3582223967,SE
+3582223096,3582223123,SE
+3582223124,3582223127,NO
+3582223128,3582223967,SE
 3582223968,3582223975,NO
-3582223976,3582226599,SE
+3582223976,3582224163,SE
+3582224164,3582224167,NO
+3582224168,3582226599,SE
 3582226600,3582226607,FI
 3582226608,3582230527,SE
 3582230528,3582238719,BE
@@ -126038,7 +127718,11 @@
 3582317568,3582318079,JE
 3582318080,3582318591,GB
 3582318592,3582318847,JE
-3582318848,3582320383,GB
+3582318848,3582318999,GB
+3582319000,3582319007,JE
+3582319008,3582319359,GB
+3582319360,3582319391,JE
+3582319392,3582320383,GB
 3582320384,3582320639,JE
 3582320640,3582328831,CH
 3582328832,3582337023,HU
@@ -126068,23 +127752,21 @@
 3582509056,3582517247,SA
 3582517248,3582525439,PL
 3582525440,3582525695,IM
-3582525696,3582525727,GB
-3582525728,3582525735,IM
-3582525736,3582525743,GB
+3582525696,3582525743,GB
 3582525744,3582525747,IM
 3582525748,3582525879,GB
 3582525880,3582525895,IM
-3582525896,3582525923,GB
-3582525924,3582525927,IM
-3582525928,3582525959,GB
-3582525960,3582525975,IM
-3582525976,3582526055,GB
-3582526056,3582526063,IM
+3582525896,3582526059,GB
+3582526060,3582526063,IM
 3582526064,3582526135,GB
 3582526136,3582526143,IM
-3582526144,3582526463,GB
+3582526144,3582526151,GB
+3582526152,3582526159,IM
+3582526160,3582526463,GB
 3582526464,3582526503,IM
-3582526504,3582526815,GB
+3582526504,3582526719,GB
+3582526720,3582526727,IM
+3582526728,3582526815,GB
 3582526816,3582526819,IM
 3582526820,3582526911,GB
 3582526912,3582526927,IM
@@ -126230,9 +127912,7 @@
 3582571648,3582571687,IE
 3582571688,3582571691,EU
 3582571692,3582571719,IE
-3582571720,3582571735,EU
-3582571736,3582571743,IE
-3582571744,3582571751,EU
+3582571720,3582571751,EU
 3582571752,3582571839,IE
 3582571840,3582571999,EU
 3582572000,3582572015,IE
@@ -126290,7 +127970,6 @@
 3582590976,3582599167,FR
 3582599168,3582607359,DE
 3582607360,3582615551,RU
-3582615552,3582623743,CY
 3582623744,3582631935,FI
 3582631936,3582640127,NO
 3582640128,3582648319,RU
@@ -126490,8 +128169,8 @@
 3583680512,3583688703,RU
 3583688704,3583696895,UA
 3583696896,3583705087,NL
-3583705088,3583705175,UA
-3583705176,3583705223,NA
+3583705088,3583705183,UA
+3583705184,3583705223,NA
 3583705224,3583705239,UA
 3583705240,3583705247,NA
 3583705248,3583705255,UA
@@ -126655,9 +128334,7 @@
 3583710120,3583710135,NA
 3583710136,3583710211,UA
 3583710212,3583710215,NA
-3583710216,3583710239,UA
-3583710240,3583710247,NA
-3583710248,3583710319,UA
+3583710216,3583710319,UA
 3583710320,3583710335,NA
 3583710336,3583710367,UA
 3583710368,3583710375,AQ
@@ -126670,29 +128347,24 @@
 3583710520,3583710527,NA
 3583710528,3583710631,UA
 3583710632,3583710639,NA
-3583710640,3583710671,UA
-3583710672,3583710679,NA
-3583710680,3583710703,UA
+3583710640,3583710703,UA
 3583710704,3583710711,NA
 3583710712,3583710743,UA
 3583710744,3583710751,BE
-3583710752,3583710823,UA
-3583710824,3583710831,NA
-3583710832,3583710855,UA
+3583710752,3583710855,UA
 3583710856,3583710863,NA
 3583710864,3583710871,UA
 3583710872,3583710879,NA
 3583710880,3583710887,UA
-3583710888,3583710903,NA
-3583710904,3583710935,UA
+3583710888,3583710895,NA
+3583710896,3583710935,UA
 3583710936,3583710943,NA
 3583710944,3583710991,UA
 3583710992,3583710999,NA
 3583711000,3583711007,UA
 3583711008,3583711015,RU
 3583711016,3583711023,NA
-3583711024,3583711079,UA
-3583711080,3583711087,GB
+3583711024,3583711087,UA
 3583711088,3583711095,NA
 3583711096,3583711247,UA
 3583711248,3583711255,NA
@@ -126730,9 +128402,7 @@
 3583712120,3583712127,NA
 3583712128,3583712159,UA
 3583712160,3583712199,NA
-3583712200,3583712287,UA
-3583712288,3583712295,NA
-3583712296,3583712311,UA
+3583712200,3583712311,UA
 3583712312,3583712319,NA
 3583712320,3583712447,UA
 3583712448,3583712479,NA
@@ -126740,10 +128410,7 @@
 3583712624,3583712631,NA
 3583712632,3583712655,UA
 3583712656,3583712663,NA
-3583712664,3583712711,UA
-3583712712,3583712719,NA
-3583712720,3583712727,UA
-3583712728,3583712735,RU
+3583712664,3583712735,UA
 3583712736,3583712743,NA
 3583712744,3583712759,UA
 3583712760,3583712763,NA
@@ -126757,11 +128424,7 @@
 3583713008,3583713015,RU
 3583713016,3583713031,UA
 3583713032,3583713039,NA
-3583713040,3583713071,UA
-3583713072,3583713079,NA
-3583713080,3583713103,UA
-3583713104,3583713111,AZ
-3583713112,3583713143,UA
+3583713040,3583713143,UA
 3583713144,3583713151,NA
 3583713152,3583713167,UA
 3583713168,3583713175,EG
@@ -126797,8 +128460,8 @@
 3583744448,3583744511,EU
 3583744512,3583744767,GB
 3583744768,3583744831,EU
-3583744832,3583744847,GB
-3583744848,3583744959,EU
+3583744832,3583744839,GB
+3583744840,3583744959,EU
 3583744960,3583744991,GB
 3583744992,3583745279,EU
 3583745280,3583745535,GB
@@ -126808,6 +128471,7 @@
 3583745808,3583745823,GB
 3583745824,3583746047,EU
 3583746048,3583754239,PL
+3583754240,3583762431,RU
 3583762432,3583770623,CZ
 3583770624,3583772351,NL
 3583772352,3583772367,IT
@@ -126974,9 +128638,7 @@
 3584511024,3584511039,KY
 3584511040,3584511055,GB
 3584511056,3584511071,NL
-3584511072,3584511135,GB
-3584511136,3584511143,HK
-3584511144,3584511807,GB
+3584511072,3584511807,GB
 3584511808,3584511871,MT
 3584511872,3584513535,GB
 3584513536,3584513567,US
@@ -126994,8 +128656,8 @@
 3584589824,3584598015,RU
 3584598016,3584606207,CZ
 3584606208,3584614399,DE
-3584614400,3584614463,GB
-3584614464,3584614527,IE
+3584614400,3584614495,GB
+3584614496,3584614527,IE
 3584614528,3584614591,GB
 3584614592,3584614623,IE
 3584614624,3584614655,GB
@@ -127365,7 +129027,7 @@
 3585940480,3585940735,BE
 3585940736,3585941503,NL
 3585941504,3585943135,PL
-3585943136,3585943167,US
+3585943136,3585943167,HU
 3585943168,3585949695,PL
 3585949696,3585957887,KW
 3585957888,3585966079,SE
@@ -127486,11 +129148,15 @@
 3586479104,3586490367,HU
 3586490368,3586506751,LT
 3586506752,3586523135,NL
-3586523136,3586543519,DE
+3586523136,3586542559,DE
+3586542560,3586542567,AE
+3586542568,3586543519,DE
 3586543520,3586543527,GB
 3586543528,3586543759,DE
 3586543760,3586543791,GB
-3586543792,3586545679,DE
+3586543792,3586544703,DE
+3586544704,3586544719,AE
+3586544720,3586545679,DE
 3586545680,3586545703,GB
 3586545704,3586546375,DE
 3586546376,3586546383,GB
@@ -127844,8 +129510,8 @@
 3587238472,3587238479,GB
 3587238480,3587238527,NL
 3587238528,3587238543,GB
-3587238544,3587238575,NL
-3587238576,3587238583,GB
+3587238544,3587238567,NL
+3587238568,3587238583,GB
 3587238584,3587238607,NL
 3587238608,3587238911,GB
 3587238912,3587239303,NL
@@ -128126,7 +129792,9 @@
 3588554688,3588554751,IE
 3588554752,3588571135,AT
 3588571136,3588587519,GB
-3588587520,3588590175,ES
+3588587520,3588588567,ES
+3588588568,3588588575,IT
+3588588576,3588590175,ES
 3588590176,3588590207,BE
 3588590208,3588594751,ES
 3588594752,3588594759,DE
@@ -128234,15 +129902,13 @@
 3589269472,3589275647,DE
 3589275648,3589292031,RS
 3589292032,3589308415,AT
-3589308416,3589317887,DE
-3589317888,3589317951,GB
-3589317952,3589324799,DE
+3589308416,3589324799,DE
 3589324800,3589341183,BG
 3589341184,3589373951,PL
 3589373952,3589375495,DE
 3589375496,3589375503,CI
 3589375504,3589390335,DE
-3589390336,3589423103,RU
+3589390336,3589406719,RU
 3589423104,3589423615,IT
 3589423616,3589424127,CH
 3589424128,3589424639,SE
@@ -128285,7 +129951,8 @@
 3589436672,3589436799,PL
 3589436800,3589436927,GB
 3589436928,3589437183,PL
-3589437184,3589439487,GB
+3589437184,3589437311,FR
+3589437312,3589439487,GB
 3589439488,3589444631,SE
 3589444632,3589444639,NO
 3589444640,3589455871,SE
@@ -128318,9 +129985,7 @@
 3589582656,3589583359,NL
 3589583360,3589583647,GB
 3589583648,3589583663,NL
-3589583664,3589583743,GB
-3589583744,3589583871,DE
-3589583872,3589584255,GB
+3589583664,3589584255,GB
 3589584256,3589584271,NL
 3589584272,3589584639,GB
 3589584640,3589585279,NL
@@ -128510,7 +130175,9 @@
 3589730112,3589730119,GB
 3589730120,3589733375,BE
 3589733376,3589733439,LU
-3589733440,3589734399,BE
+3589733440,3589734167,BE
+3589734168,3589734175,DE
+3589734176,3589734399,BE
 3589734400,3589742591,EG
 3589742592,3589742687,NL
 3589742688,3589742695,AT
@@ -128524,7 +130191,9 @@
 3589745120,3589745151,BE
 3589745152,3589746087,NL
 3589746088,3589746095,DE
-3589746096,3589747071,NL
+3589746096,3589746175,NL
+3589746176,3589746687,US
+3589746688,3589747071,NL
 3589747072,3589747103,ES
 3589747104,3589767167,NL
 3589767168,3589816319,RU
@@ -128593,7 +130262,9 @@
 3589997560,3589997567,NL
 3589997568,3590012927,GB
 3590012928,3590029311,BE
-3590029312,3590045695,FR
+3590029312,3590033759,FR
+3590033760,3590033775,AU
+3590033776,3590045695,FR
 3590045696,3590062079,RU
 3590062080,3590078463,DE
 3590078464,3590094847,RU
@@ -128613,7 +130284,9 @@
 3590155824,3590155871,SI
 3590155872,3590156431,HR
 3590156432,3590156447,SI
-3590156448,3590156671,HR
+3590156448,3590156543,HR
+3590156544,3590156575,SI
+3590156576,3590156671,HR
 3590156672,3590156687,SI
 3590156688,3590156719,HR
 3590156720,3590156727,SI
@@ -128766,28 +130439,35 @@
 3590308056,3590308063,A2
 3590308064,3590308071,ZW
 3590308072,3590308079,RW
-3590308080,3590308087,TZ
-3590308088,3590308095,AO
-3590308096,3590308119,A2
+3590308080,3590308095,A2
+3590308096,3590308103,IQ
+3590308104,3590308119,A2
 3590308120,3590308127,IQ
 3590308128,3590308175,A2
 3590308176,3590308191,IQ
 3590308192,3590308199,A2
-3590308200,3590308215,IQ
-3590308216,3590308247,A2
+3590308200,3590308238,IQ
+3590308239,3590308247,A2
 3590308248,3590308287,IQ
 3590308288,3590308303,A2
 3590308304,3590308311,SO
-3590308312,3590308319,IQ
-3590308320,3590308327,A2
-3590308328,3590308343,IQ
+3590308312,3590308319,A2
+3590308320,3590308343,IQ
 3590308344,3590308351,A2
 3590308352,3590308367,IQ
 3590308368,3590308383,A2
 3590308384,3590308391,IQ
-3590308392,3590308447,A2
+3590308392,3590308407,A2
+3590308408,3590308423,IQ
+3590308424,3590308431,A2
+3590308432,3590308439,IQ
+3590308440,3590308447,A2
 3590308448,3590308455,IQ
-3590308456,3590308607,A2
+3590308456,3590308463,A2
+3590308464,3590308471,IQ
+3590308472,3590308519,A2
+3590308520,3590308527,IQ
+3590308528,3590308607,A2
 3590308608,3590308735,NG
 3590308736,3590308767,A2
 3590308768,3590308775,RW
@@ -128802,8 +130482,7 @@
 3590308952,3590308959,GH
 3590308960,3590308999,A2
 3590309000,3590309007,UG
-3590309008,3590309023,TZ
-3590309024,3590309039,A2
+3590309008,3590309039,A2
 3590309040,3590309055,ZW
 3590309056,3590309063,CD
 3590309064,3590309071,A2
@@ -128831,9 +130510,7 @@
 3590309720,3590309727,A2
 3590309728,3590309759,IQ
 3590309760,3590309767,A2
-3590309768,3590309775,IQ
-3590309776,3590309783,A2
-3590309784,3590309791,IQ
+3590309768,3590309791,IQ
 3590309792,3590309799,A2
 3590309800,3590309807,IQ
 3590309808,3590309815,A2
@@ -128854,8 +130531,8 @@
 3590310224,3590310255,IQ
 3590310256,3590310263,A2
 3590310264,3590310271,SD
-3590310272,3590310279,A2
-3590310280,3590310303,IQ
+3590310272,3590310287,A2
+3590310288,3590310303,IQ
 3590310304,3590310311,A2
 3590310312,3590310319,IQ
 3590310320,3590310327,A2
@@ -128876,11 +130553,11 @@
 3590311016,3590311023,IQ
 3590311024,3590311031,A2
 3590311032,3590311039,IQ
-3590311040,3590311055,A2
-3590311056,3590311063,IQ
-3590311064,3590311079,A2
-3590311080,3590311087,IQ
-3590311088,3590311119,A2
+3590311040,3590311079,A2
+3590311080,3590311095,IQ
+3590311096,3590311103,A2
+3590311104,3590311111,IQ
+3590311112,3590311119,A2
 3590311120,3590311135,IQ
 3590311136,3590311143,A2
 3590311144,3590311151,IQ
@@ -129028,9 +130705,7 @@
 3590322064,3590322071,IQ
 3590322072,3590322111,A2
 3590322112,3590322119,BJ
-3590322120,3590322127,A2
-3590322128,3590322135,GH
-3590322136,3590322151,A2
+3590322120,3590322151,A2
 3590322152,3590322159,LY
 3590322160,3590322175,A2
 3590322176,3590322239,IQ
@@ -129051,17 +130726,13 @@
 3590323912,3590323967,A2
 3590323968,3590323975,SD
 3590323976,3590323983,A2
-3590323984,3590323999,NG
+3590323984,3590323991,NG
+3590323992,3590323999,A2
 3590324000,3590324007,LR
 3590324008,3590324015,A2
 3590324016,3590324023,NG
 3590324024,3590324031,ZW
-3590324032,3590324103,A2
-3590324104,3590324111,KE
-3590324112,3590324119,A2
-3590324120,3590324127,NG
-3590324128,3590324159,A2
-3590324160,3590324167,NG
+3590324032,3590324167,A2
 3590324168,3590324175,BW
 3590324176,3590324183,LR
 3590324184,3590324191,SD
@@ -129088,7 +130759,9 @@
 3624272384,3624272415,US
 3624272416,3624272639,CA
 3624272640,3624272895,DZ
-3624272896,3624279071,CA
+3624272896,3624275967,CA
+3624275968,3624276223,US
+3624276224,3624279071,CA
 3624279072,3624279087,BD
 3624279088,3624281087,CA
 3624281088,3624281343,HT
@@ -129098,11 +130771,15 @@
 3624288256,3624290303,IN
 3624290304,3624292351,CA
 3624292352,3624292607,MF
-3624292608,3624294143,CA
+3624292608,3624292863,US
+3624292864,3624294143,CA
 3624294144,3624294399,US
-3624294400,3624295935,CA
+3624294400,3624294911,CA
+3624294912,3624295167,US
+3624295168,3624295935,CA
 3624295936,3624296191,LY
-3624296192,3624297471,CA
+3624296192,3624297215,CA
+3624297216,3624297471,US
 3624297472,3624298495,CO
 3624298496,3624299519,PH
 3624299520,3624300031,CA
@@ -129136,9 +130813,7 @@
 3624376032,3624376247,US
 3624376248,3624376263,ES
 3624376264,3624376279,CY
-3624376280,3624376287,GB
-3624376288,3624376295,US
-3624376296,3624376303,GB
+3624376280,3624376303,GB
 3624376304,3624376335,US
 3624376336,3624376343,AU
 3624376344,3624376351,US
@@ -129149,11 +130824,23 @@
 3624376656,3624376679,GB
 3624376680,3624377319,US
 3624377320,3624377323,GB
-3624377324,3624377879,US
+3624377324,3624377863,US
+3624377864,3624377871,GB
+3624377872,3624377879,US
 3624377880,3624377887,GB
-3624377888,3624378039,US
+3624377888,3624377903,US
+3624377904,3624377911,GB
+3624377912,3624377919,US
+3624377920,3624377935,ES
+3624377936,3624377999,US
+3624378000,3624378007,ES
+3624378008,3624378039,US
 3624378040,3624378047,GB
-3624378048,3624379391,US
+3624378048,3624378055,US
+3624378056,3624378063,GB
+3624378064,3624378087,US
+3624378088,3624378095,GB
+3624378096,3624379391,US
 3624379392,3624379399,SG
 3624379400,3624380415,US
 3624380416,3624380447,CA
@@ -129300,17 +130987,30 @@
 3624895104,3624895119,DE
 3624895120,3624895135,US
 3624895136,3624895151,IN
-3624895152,3624895775,US
+3624895152,3624895167,US
+3624895168,3624895183,VE
+3624895184,3624895775,US
 3624895776,3624895807,MY
 3624895808,3624895935,US
 3624895936,3624895967,IN
-3624895968,3624896287,US
+3624895968,3624895999,US
+3624896000,3624896255,CA
+3624896256,3624896287,US
 3624896288,3624896319,GB
-3624896320,3624896415,US
+3624896320,3624896383,US
+3624896384,3624896415,IN
 3624896416,3624896447,AT
-3624896448,3624897791,US
+3624896448,3624896767,US
+3624896768,3624896831,IN
+3624896832,3624897279,US
+3624897280,3624897407,CA
+3624897408,3624897535,US
+3624897536,3624897663,CA
+3624897664,3624897791,US
 3624897792,3624898047,IN
-3624898048,3624898815,US
+3624898048,3624898303,US
+3624898304,3624898559,CA
+3624898560,3624898815,US
 3624898816,3624899071,AU
 3624899072,3624899327,CA
 3624899328,3624899583,US
@@ -129322,14 +131022,16 @@
 3624900736,3624900767,CA
 3624900768,3624900831,US
 3624900832,3624900863,DE
-3624900864,3624900951,US
+3624900864,3624900903,US
+3624900904,3624900911,CA
+3624900912,3624900951,US
 3624900952,3624900959,FR
 3624900960,3624900967,US
 3624900968,3624900975,CA
 3624900976,3624901103,US
-3624901104,3624901111,PK
+3624901104,3624901111,IN
 3624901112,3624901279,US
-3624901280,3624901311,IN
+3624901280,3624901311,CA
 3624901312,3624901343,BE
 3624901344,3624901887,US
 3624901888,3624901919,IN
@@ -129343,27 +131045,34 @@
 3624902784,3624902911,CA
 3624902912,3624902943,US
 3624902944,3624902975,CA
-3624902976,3624903167,US
-3624903168,3624903423,CA
-3624903424,3624903551,US
-3624903552,3624903583,CA
+3624902976,3624903071,US
+3624903072,3624903103,HK
+3624903104,3624903455,US
+3624903456,3624903487,CA
+3624903488,3624903519,US
+3624903520,3624903583,CA
 3624903584,3624903679,US
 3624903680,3624903807,CA
 3624903808,3624903935,US
 3624903936,3624904703,CA
 3624904704,3624904767,IN
-3624904768,3624905087,US
-3624905088,3624905151,CA
-3624905152,3624905471,US
+3624904768,3624904831,US
+3624904832,3624904895,CA
+3624904896,3624905023,IN
+3624905024,3624905087,US
+3624905088,3624905215,CA
+3624905216,3624905471,US
 3624905472,3624905727,CA
 3624905728,3624906465,US
 3624906466,3624906495,CA
-3624906496,3624906879,US
+3624906496,3624906751,US
+3624906752,3624906879,CA
 3624906880,3624907007,TW
 3624907008,3624907039,FR
 3624907040,3624907071,US
-3624907072,3624907103,GB
-3624907104,3624907455,US
+3624907072,3624907103,CA
+3624907104,3624907391,US
+3624907392,3624907455,IN
 3624907456,3624907518,MY
 3624907519,3624907519,US
 3624907520,3624907551,IN
@@ -129378,12 +131087,14 @@
 3624908032,3624908159,CA
 3624908160,3624908287,US
 3624908288,3624908319,CA
-3624908320,3624908351,US
-3624908352,3624908383,BR
+3624908320,3624908383,US
 3624908384,3624908415,IN
-3624908416,3624908479,US
+3624908416,3624908447,CA
+3624908448,3624908479,US
 3624908480,3624908511,CA
-3624908512,3624908607,US
+3624908512,3624908559,US
+3624908560,3624908575,MY
+3624908576,3624908607,US
 3624908608,3624908622,CA
 3624908623,3624908639,US
 3624908640,3624908687,CA
@@ -129404,8 +131115,9 @@
 3624910176,3624910207,BE
 3624910208,3624910271,US
 3624910272,3624910303,FR
-3624910304,3624910655,US
-3624910656,3624910687,TZ
+3624910304,3624910591,US
+3624910592,3624910623,CA
+3624910624,3624910687,US
 3624910688,3624910719,CA
 3624910720,3624910751,US
 3624910752,3624910783,TZ
@@ -129414,21 +131126,21 @@
 3624910848,3624910911,US
 3624910912,3624910975,IN
 3624910976,3624911007,FR
-3624911008,3624911039,GB
+3624911008,3624911039,CA
 3624911040,3624911103,US
 3624911104,3624911135,CA
 3624911136,3624911167,US
 3624911168,3624911199,MY
 3624911200,3624911231,BE
 3624911232,3624911263,CA
-3624911264,3624911359,US
-3624911360,3624911615,CA
+3624911264,3624911327,US
+3624911328,3624911615,CA
 3624911616,3624911647,US
 3624911648,3624911651,RU
 3624911652,3624911999,US
 3624912000,3624912127,CA
-3624912128,3624913023,US
-3624913024,3624913087,IN
+3624912128,3624912959,US
+3624912960,3624913087,IN
 3624913088,3624913247,US
 3624913248,3624913279,CA
 3624913280,3624913311,US
@@ -129516,7 +131228,9 @@
 3624924896,3624924927,CA
 3624924928,3624925054,US
 3624925055,3624925695,CA
-3624925696,3624926719,US
+3624925696,3624926591,US
+3624926592,3624926655,IN
+3624926656,3624926719,US
 3624926720,3624926975,CA
 3624926976,3624927039,US
 3624927040,3624927071,HK
@@ -129696,7 +131410,9 @@
 3626072960,3626072991,AE
 3626072992,3626073439,US
 3626073440,3626073455,AE
-3626073456,3626108895,US
+3626073456,3626091519,US
+3626091520,3626092031,AR
+3626092032,3626108895,US
 3626108896,3626108927,AU
 3626108928,3626130415,US
 3626130416,3626130431,CA
@@ -130550,7 +132266,9 @@
 3628772432,3628772447,GB
 3628772448,3628834815,US
 3628834816,3628843007,CA
-3628843008,3629187071,US
+3628843008,3628963007,US
+3628963008,3628963039,PA
+3628963040,3629187071,US
 3629187072,3629195263,CA
 3629195264,3629199359,US
 3629199360,3629201463,CA
@@ -130577,7 +132295,9 @@
 3629201856,3629201887,US
 3629201888,3629201903,CA
 3629201904,3629201919,US
-3629201920,3629201983,CA
+3629201920,3629201959,CA
+3629201960,3629201967,US
+3629201968,3629201983,CA
 3629201984,3629201991,US
 3629201992,3629201999,CA
 3629202000,3629202003,US
@@ -131157,7 +132877,17 @@
 3631045632,3631045759,CA
 3631045760,3631045983,US
 3631045984,3631045991,CA
-3631045992,3631112191,US
+3631045992,3631057577,US
+3631057578,3631057597,GB
+3631057598,3631058405,US
+3631058406,3631058415,CA
+3631058416,3631058511,US
+3631058512,3631058521,CA
+3631058522,3631058581,US
+3631058582,3631058591,CA
+3631058592,3631059229,US
+3631059230,3631059239,NO
+3631059240,3631112191,US
 3631112192,3631116543,BB
 3631116544,3631117567,GD
 3631117568,3631117823,BB
@@ -131218,7 +132948,43 @@
 3631673264,3631673295,BB
 3631673296,3631673311,EC
 3631673312,3631677439,A2
-3631677440,3631841279,US
+3631677440,3631712287,US
+3631712288,3631712295,AR
+3631712296,3631712303,US
+3631712304,3631712311,CA
+3631712312,3631712327,US
+3631712328,3631712335,VE
+3631712336,3631712407,US
+3631712408,3631712415,GB
+3631712416,3631712423,US
+3631712424,3631712431,PT
+3631712432,3631712439,US
+3631712440,3631712447,IN
+3631712448,3631712463,US
+3631712464,3631712471,CA
+3631712472,3631712495,US
+3631712496,3631712503,UY
+3631712504,3631712511,DE
+3631712512,3631712527,US
+3631712528,3631712535,MX
+3631712536,3631712543,JP
+3631712544,3631712551,CY
+3631712552,3631712559,US
+3631712560,3631712567,AR
+3631712568,3631712695,US
+3631712696,3631712703,NZ
+3631712704,3631712751,US
+3631712752,3631712759,CA
+3631712760,3631712895,US
+3631712896,3631712903,MX
+3631712904,3631712911,CA
+3631712912,3631712927,US
+3631712928,3631712935,BR
+3631712936,3631712951,GB
+3631712952,3631713031,US
+3631713032,3631713039,BR
+3631713040,3631713047,IN
+3631713048,3631841279,US
 3631841280,3631874047,CA
 3631874048,3631879199,US
 3631879200,3631879231,CA
@@ -131226,12 +132992,13 @@
 3631881760,3631881791,CA
 3631881792,3631939583,US
 3631939584,3632005119,CA
-3632005120,3632136191,US
-3632144384,3632152575,US
+3632005120,3632152575,US
 3632152576,3632168959,CA
 3632168960,3632197631,US
 3632197632,3632201727,CA
-3632201728,3632244223,US
+3632201728,3632232447,US
+3632232448,3632232703,A2
+3632232704,3632244223,US
 3632244224,3632244479,CA
 3632244480,3632270025,US
 3632270026,3632270058,CA
@@ -131249,7 +133016,7 @@
 3632332800,3632357375,CA
 3632357376,3632381951,US
 3632381952,3632390143,CA
-3632390144,3632406527,US
+3632390144,3632414719,US
 3632414720,3632422911,CA
 3632422912,3632451583,US
 3632451584,3632455679,CA
@@ -131512,9 +133279,7 @@
 3632490544,3632490551,TH
 3632490552,3632490559,US
 3632490560,3632490623,DE
-3632490624,3632490687,US
-3632490688,3632490695,BZ
-3632490696,3632490703,US
+3632490624,3632490703,US
 3632490704,3632490719,TH
 3632490720,3632490751,US
 3632490752,3632490783,GB
@@ -131536,8 +133301,8 @@
 3632491072,3632491087,GB
 3632491088,3632491151,US
 3632491152,3632491167,IN
-3632491168,3632491231,US
-3632491232,3632491247,CA
+3632491168,3632491239,US
+3632491240,3632491247,CA
 3632491248,3632491263,US
 3632491264,3632491327,DM
 3632491328,3632491343,FR
@@ -131595,9 +133360,7 @@
 3632492992,3632493015,US
 3632493016,3632493023,GI
 3632493024,3632493055,GB
-3632493056,3632493071,US
-3632493072,3632493079,ID
-3632493080,3632493087,US
+3632493056,3632493087,US
 3632493088,3632493119,IO
 3632493120,3632493151,US
 3632493152,3632493159,GR
@@ -131889,16 +133652,24 @@
 3633816520,3633816527,ZA
 3633816528,3633816535,CA
 3633816536,3633816543,US
-3633816544,3633819135,CA
+3633816544,3633818703,CA
+3633818704,3633818711,US
+3633818712,3633819135,CA
 3633819136,3633819199,IN
 3633819200,3633819391,CA
 3633819392,3633819423,IN
 3633819424,3633819647,CA
 3633819648,3633821279,US
 3633821280,3633821311,BB
-3633821312,3633822303,US
+3633821312,3633821439,US
+3633821440,3633821695,SC
+3633821696,3633822175,US
+3633822176,3633822191,GB
+3633822192,3633822303,US
 3633822304,3633822327,CA
-3633822328,3633881087,US
+3633822328,3633827839,US
+3633827840,3633828095,GB
+3633828096,3633881087,US
 3633881088,3633885183,AN
 3633885184,3633889279,US
 3633889280,3633893375,CA
@@ -131947,7 +133718,9 @@
 3634511872,3634515967,CA
 3634515968,3634552831,US
 3634552832,3634556927,CA
-3634556928,3634880511,US
+3634556928,3634741247,US
+3634741248,3634749439,CA
+3634749440,3634880511,US
 3634880512,3634888703,CA
 3634888704,3634913279,US
 3634913280,3634915663,CA
@@ -132006,7 +133779,7 @@
 3635532928,3635532999,US
 3635533000,3635533007,NO
 3635533008,3635533535,US
-3635533536,3635533551,PR
+3635533536,3635533551,IN
 3635533552,3635658751,US
 3635658752,3635660799,CN
 3635660800,3635829631,US
@@ -132161,7 +133934,15 @@
 3636265536,3636265599,DE
 3636265600,3636266879,US
 3636266880,3636266911,HK
-3636266912,3636396031,US
+3636266912,3636277759,US
+3636277760,3636278015,FR
+3636278016,3636283391,US
+3636283392,3636283647,FR
+3636283648,3636290815,US
+3636290816,3636291327,FR
+3636291328,3636296703,US
+3636296704,3636297727,FR
+3636297728,3636396031,US
 3636396032,3636461567,CA
 3636461568,3636577647,US
 3636577648,3636577663,CA
@@ -132244,8 +134025,7 @@
 3636907232,3636907775,US
 3636907776,3636908031,CA
 3636908032,3636908543,US
-3636908544,3636908799,IN
-3636908800,3636908863,US
+3636908544,3636908863,IN
 3636908864,3636908991,CA
 3636908992,3636909055,US
 3636909056,3636909311,CA
@@ -132330,7 +134110,9 @@
 3636919712,3636919743,BE
 3636919744,3636919807,US
 3636919808,3636919871,GB
-3636919872,3636920127,US
+3636919872,3636919999,US
+3636920000,3636920063,IN
+3636920064,3636920127,US
 3636920128,3636920191,CA
 3636920192,3637071887,US
 3637071888,3637071903,AD
@@ -132405,7 +134187,9 @@
 3638198984,3638198991,ES
 3638198992,3638199711,US
 3638199712,3638199743,DE
-3638199744,3638200007,US
+3638199744,3638199815,US
+3638199816,3638199823,AU
+3638199824,3638200007,US
 3638200008,3638200015,JP
 3638200016,3638206407,US
 3638206408,3638206415,LU
@@ -132505,7 +134289,9 @@
 3638370304,3638374751,CA
 3638374752,3638374767,US
 3638374768,3638386687,CA
-3638386688,3638509295,US
+3638386688,3638398975,US
+3638398976,3638398991,GB
+3638398992,3638509295,US
 3638509296,3638509311,GB
 3638509312,3638509567,US
 3638509568,3638526911,CA
@@ -132631,10 +134417,13 @@
 3639439632,3639439639,RO
 3639439640,3639440767,US
 3639440768,3639440895,IN
-3639440896,3639476223,US
+3639440896,3639484415,US
 3639541760,3639558143,US
 3639558144,3639566335,CA
-3639566336,3639607295,US
+3639566336,3639582719,US
+3639590912,3639593983,US
+3639593984,3639595007,GB
+3639595008,3639607295,US
 3639607296,3639611391,CA
 3639611392,3639656447,US
 3639656448,3639660543,CA
@@ -132737,13 +134526,19 @@
 3639892416,3639892431,MX
 3639892432,3639892815,US
 3639892816,3639892831,MX
-3639892832,3639893119,US
-3639893120,3639893151,DE
+3639892832,3639893007,US
+3639893008,3639893023,DE
+3639893024,3639893039,US
+3639893040,3639893071,DE
+3639893072,3639893087,US
+3639893088,3639893151,DE
 3639893152,3639893167,US
 3639893168,3639893199,DE
 3639893200,3639893207,US
 3639893208,3639893215,DE
-3639893216,3639902207,US
+3639893216,3639893503,US
+3639893504,3639893519,ID
+3639893520,3639902207,US
 3639902208,3639918591,PE
 3639918592,3639934975,AR
 3639934976,3640001751,US
@@ -132764,7 +134559,13 @@
 3640023272,3640023279,HK
 3640023280,3640027415,US
 3640027416,3640027423,GB
-3640027424,3640057855,US
+3640027424,3640028279,US
+3640028280,3640028287,AF
+3640028288,3640028295,US
+3640028296,3640028303,CA
+3640028304,3640028335,US
+3640028336,3640028343,CA
+3640028344,3640057855,US
 3640057856,3640066047,CA
 3640066048,3640075391,US
 3640075392,3640075407,NL
@@ -133199,8 +135000,8 @@
 3641764716,3641764775,GR
 3641764776,3641764783,CY
 3641764784,3641764787,GR
-3641764788,3641764791,CY
-3641764792,3641764847,GR
+3641764788,3641764799,CY
+3641764800,3641764847,GR
 3641764848,3641764856,CY
 3641764857,3641764863,GR
 3641764864,3641764875,CY
@@ -133486,7 +135287,9 @@
 3642404864,3642408959,RU
 3642408960,3642413055,FR
 3642413056,3642414591,RS
-3642414592,3642415627,GB
+3642414592,3642414847,GB
+3642414848,3642414975,RS
+3642414976,3642415627,GB
 3642415628,3642415635,MT
 3642415636,3642415651,GB
 3642415652,3642415655,MT
@@ -133538,7 +135341,9 @@
 3642539871,3642539971,IS
 3642539972,3642539975,DK
 3642539976,3642540031,IS
-3642540032,3642544127,SE
+3642540032,3642540063,SE
+3642540064,3642540079,NO
+3642540080,3642544127,SE
 3642544128,3642552319,RU
 3642552320,3642552639,UA
 3642552640,3642552655,EE
@@ -133551,45 +135356,47 @@
 3642552848,3642553095,UA
 3642553096,3642553139,LV
 3642553140,3642553143,UA
-3642553144,3642553175,LV
+3642553144,3642553161,LV
+3642553162,3642553163,UA
+3642553164,3642553175,LV
 3642553176,3642553183,UA
-3642553184,3642553343,LV
+3642553184,3642553215,LV
+3642553216,3642553279,UA
+3642553280,3642553343,LV
 3642553344,3642553371,RU
-3642553372,3642553375,UA
-3642553376,3642553377,RU
-3642553378,3642553379,UA
+3642553372,3642553379,UA
 3642553380,3642553383,RU
-3642553384,3642553387,UA
-3642553388,3642553411,RU
+3642553384,3642553407,UA
+3642553408,3642553411,RU
 3642553412,3642553415,UA
 3642553416,3642553423,RU
 3642553424,3642553431,UA
 3642553432,3642553463,RU
-3642553464,3642553467,UA
-3642553468,3642553519,RU
+3642553464,3642553471,UA
+3642553472,3642553519,RU
 3642553520,3642553523,UA
 3642553524,3642553535,RU
 3642553536,3642553543,DE
-3642553544,3642553575,RU
+3642553544,3642553567,RU
+3642553568,3642553571,UA
+3642553572,3642553575,RU
 3642553576,3642553579,UA
 3642553580,3642553589,RU
 3642553590,3642553591,UA
 3642553592,3642553599,RU
 3642553600,3642553855,UA
-3642553856,3642553925,RU
-3642553926,3642553935,UA
-3642553936,3642553959,RU
-3642553960,3642554111,UA
+3642553856,3642553927,RU
+3642553928,3642553935,UA
+3642553936,3642553963,RU
+3642553964,3642554111,UA
 3642554112,3642554119,RU
 3642554120,3642554123,UA
 3642554124,3642554151,RU
-3642554152,3642554177,UA
-3642554178,3642554207,RU
-3642554208,3642554211,UA
-3642554212,3642554223,RU
-3642554224,3642554239,UA
-3642554240,3642554271,RU
-3642554272,3642554367,UA
+3642554152,3642554187,UA
+3642554188,3642554207,RU
+3642554208,3642554215,UA
+3642554216,3642554223,RU
+3642554224,3642554367,UA
 3642554368,3642554623,LT
 3642554624,3642554631,UA
 3642554632,3642554671,LV
@@ -133598,8 +135405,8 @@
 3642554688,3642554751,UA
 3642554752,3642554791,LV
 3642554792,3642554807,UA
-3642554808,3642554815,LV
-3642554816,3642554847,UA
+3642554808,3642554831,LV
+3642554832,3642554847,UA
 3642554848,3642554879,LV
 3642554880,3642554911,DE
 3642554912,3642554919,NL
@@ -133638,7 +135445,11 @@
 3642555228,3642555289,LT
 3642555290,3642555295,UA
 3642555296,3642555391,LT
-3642555392,3642555493,PL
+3642555392,3642555439,PL
+3642555440,3642555443,UA
+3642555444,3642555471,PL
+3642555472,3642555475,UA
+3642555476,3642555493,PL
 3642555494,3642555495,UA
 3642555496,3642555503,PL
 3642555504,3642555647,UA
@@ -133732,7 +135543,7 @@
 3644899328,3644903423,IT
 3644903424,3644907519,TR
 3644907520,3644908983,GB
-3644908984,3644908991,IT
+3644908984,3644908991,US
 3644908992,3644909855,GB
 3644909856,3644909859,IS
 3644909860,3644911615,GB
@@ -133780,123 +135591,7 @@
 3645030400,3645038591,IR
 3645038592,3645046783,PS
 3645046784,3645050879,RU
-3645050880,3645051059,SK
-3645051060,3645051063,CZ
-3645051064,3645051131,SK
-3645051132,3645051135,CZ
-3645051136,3645051223,SK
-3645051224,3645051247,CZ
-3645051248,3645051255,SK
-3645051256,3645051279,CZ
-3645051280,3645051379,SK
-3645051380,3645051383,CZ
-3645051384,3645051439,SK
-3645051440,3645051455,CZ
-3645051456,3645051555,SK
-3645051556,3645051559,CZ
-3645051560,3645051567,SK
-3645051568,3645051583,CZ
-3645051584,3645051599,SK
-3645051600,3645051615,CZ
-3645051616,3645051639,SK
-3645051640,3645051647,CZ
-3645051648,3645051671,SK
-3645051672,3645051711,CZ
-3645051712,3645051719,SK
-3645051720,3645051727,CZ
-3645051728,3645051775,SK
-3645051776,3645051791,CZ
-3645051792,3645051815,SK
-3645051816,3645051823,CZ
-3645051824,3645051887,SK
-3645051888,3645051899,CZ
-3645051900,3645051943,SK
-3645051944,3645051951,CZ
-3645051952,3645051967,SK
-3645051968,3645051975,CZ
-3645051976,3645051979,SK
-3645051980,3645051999,CZ
-3645052000,3645052015,SK
-3645052016,3645052031,CZ
-3645052032,3645052095,SK
-3645052096,3645052103,CZ
-3645052104,3645052127,SK
-3645052128,3645052143,CZ
-3645052144,3645052183,SK
-3645052184,3645052191,CZ
-3645052192,3645052263,SK
-3645052264,3645052287,CZ
-3645052288,3645052351,SK
-3645052352,3645052367,CZ
-3645052368,3645052407,SK
-3645052408,3645052415,CZ
-3645052416,3645052423,SK
-3645052424,3645052431,CZ
-3645052432,3645052447,SK
-3645052448,3645052455,CZ
-3645052456,3645052591,SK
-3645052592,3645052599,CZ
-3645052600,3645052607,SK
-3645052608,3645052631,CZ
-3645052632,3645052655,SK
-3645052656,3645052663,CZ
-3645052664,3645052943,SK
-3645052944,3645052951,CZ
-3645052952,3645052983,SK
-3645052984,3645052991,CZ
-3645052992,3645052999,SK
-3645053000,3645053007,CZ
-3645053008,3645053015,SK
-3645053016,3645053023,CZ
-3645053024,3645053079,SK
-3645053080,3645053087,CZ
-3645053088,3645053095,SK
-3645053096,3645053099,CZ
-3645053100,3645053123,SK
-3645053124,3645053131,CZ
-3645053132,3645053135,SK
-3645053136,3645053139,CZ
-3645053140,3645053143,SK
-3645053144,3645053167,CZ
-3645053168,3645053179,SK
-3645053180,3645053183,CZ
-3645053184,3645053263,SK
-3645053264,3645053271,CZ
-3645053272,3645053287,SK
-3645053288,3645053295,CZ
-3645053296,3645053311,SK
-3645053312,3645053319,CZ
-3645053320,3645053343,SK
-3645053344,3645053351,CZ
-3645053352,3645053535,SK
-3645053536,3645053543,CZ
-3645053544,3645053647,SK
-3645053648,3645053663,CZ
-3645053664,3645053727,SK
-3645053728,3645053735,CZ
-3645053736,3645053743,SK
-3645053744,3645053751,CZ
-3645053752,3645053911,SK
-3645053912,3645053919,CZ
-3645053920,3645053923,SK
-3645053924,3645053927,CZ
-3645053928,3645053951,SK
-3645053952,3645053959,CZ
-3645053960,3645053963,SK
-3645053964,3645053967,CZ
-3645053968,3645053999,SK
-3645054000,3645054007,CZ
-3645054008,3645054255,SK
-3645054256,3645054263,CZ
-3645054264,3645054303,SK
-3645054304,3645054311,CZ
-3645054312,3645054315,SK
-3645054316,3645054319,CZ
-3645054320,3645054351,SK
-3645054352,3645054359,CZ
-3645054360,3645054383,SK
-3645054384,3645054399,CZ
-3645054400,3645054975,SK
+3645050880,3645054975,SK
 3645054976,3645059071,DE
 3645059072,3645063167,GB
 3645063168,3645067263,UA
@@ -133969,7 +135664,9 @@
 3645259776,3645263871,PT
 3645263872,3645267967,FR
 3645267968,3645276159,RU
-3645276160,3645280255,DE
+3645276160,3645278423,DE
+3645278424,3645278431,PT
+3645278432,3645280255,DE
 3645280256,3645281279,IT
 3645281280,3645281535,DE
 3645281536,3645281791,IT
@@ -135058,7 +136755,8 @@
 3645888128,3645888143,AT
 3645888144,3645888159,DE
 3645888160,3645888191,AT
-3645888192,3645889791,DE
+3645888192,3645888223,SG
+3645888224,3645889791,DE
 3645889792,3645889919,US
 3645889920,3645890559,DE
 3645890560,3645894655,RU
@@ -135139,9 +136837,7 @@
 3647965296,3647965303,DE
 3647965304,3647965311,ES
 3647965312,3647965319,DE
-3647965320,3647965343,ES
-3647965344,3647965351,DE
-3647965352,3647965359,ES
+3647965320,3647965359,ES
 3647965360,3647965375,DE
 3647965376,3647965407,ES
 3647965408,3647965439,DE
@@ -135196,9 +136892,7 @@
 3647977856,3647978495,GB
 3647978496,3647978775,NL
 3647978776,3647978783,DE
-3647978784,3647978871,NL
-3647978872,3647978879,DE
-3647978880,3647978895,NL
+3647978784,3647978895,NL
 3647978896,3647978911,DE
 3647978912,3647978927,NL
 3647978928,3647979007,DE
@@ -135211,7 +136905,11 @@
 3647982592,3647983615,IT
 3647983616,3647984639,NL
 3647984640,3647985151,DK
-3647985152,3647995903,DE
+3647985152,3647985663,BE
+3647985664,3647985919,ES
+3647985920,3647985935,BE
+3647985936,3647986687,ES
+3647986688,3647995903,DE
 3647995904,3648004095,RU
 3648004096,3648004607,GB
 3648004608,3648006271,RU
@@ -135282,7 +136980,7 @@
 3648081056,3648081407,BE
 3648081408,3648082175,MW
 3648082176,3648082239,BE
-3648082240,3648082687,LR
+3648082240,3648082687,ZM
 3648082688,3648085759,BE
 3648085760,3648086015,LR
 3648086016,3648090111,AT
@@ -135589,7 +137287,9 @@
 3650316716,3650318335,DE
 3650318336,3650320383,GI
 3650320384,3650322431,GB
-3650322432,3650330623,IT
+3650322432,3650323327,IT
+3650323328,3650323359,SZ
+3650323360,3650330623,IT
 3650330624,3650334719,UA
 3650334720,3650338815,GB
 3650338816,3650342911,FR
@@ -136130,7 +137830,9 @@
 3652034560,3652046847,PL
 3652046848,3652050271,IE
 3652050272,3652050299,GB
-3652050300,3652050499,IE
+3652050300,3652050315,IE
+3652050316,3652050323,GB
+3652050324,3652050499,IE
 3652050500,3652050503,GB
 3652050504,3652050527,IE
 3652050528,3652050535,GB
@@ -136307,8 +138009,8 @@
 3653408232,3653408239,KE
 3653408240,3653408247,BF
 3653408248,3653408271,A2
-3653408272,3653408287,IQ
-3653408288,3653408319,A2
+3653408272,3653408279,IQ
+3653408280,3653408319,A2
 3653408320,3653408327,IQ
 3653408328,3653408767,A2
 3653408768,3653409023,CD
@@ -136320,11 +138022,9 @@
 3653409088,3653409095,CD
 3653409096,3653409103,A2
 3653409104,3653409111,MW
-3653409112,3653409119,NG
-3653409120,3653409127,A2
+3653409112,3653409127,A2
 3653409128,3653409143,CD
-3653409144,3653409151,NG
-3653409152,3653409191,A2
+3653409144,3653409191,A2
 3653409192,3653409199,NG
 3653409200,3653409223,A2
 3653409224,3653409231,NG
@@ -136356,9 +138056,7 @@
 3653410176,3653410183,US
 3653410184,3653410191,MZ
 3653410192,3653410199,ZW
-3653410200,3653410215,A2
-3653410216,3653410223,ZW
-3653410224,3653410247,A2
+3653410200,3653410247,A2
 3653410248,3653410255,ZM
 3653410256,3653410263,A2
 3653410264,3653410271,NG
@@ -136390,11 +138088,15 @@
 3653472576,3653472591,NL
 3653472592,3653472767,AF
 3653472768,3653472775,NL
-3653472776,3653472807,AF
+3653472776,3653472791,AF
+3653472792,3653472799,NL
+3653472800,3653472807,AF
 3653472808,3653472815,NL
 3653472816,3653472823,AF
 3653472824,3653472831,NL
-3653472832,3653472915,AF
+3653472832,3653472871,AF
+3653472872,3653472879,NL
+3653472880,3653472915,AF
 3653472916,3653472919,NL
 3653472920,3653472983,AF
 3653472984,3653472999,NL
@@ -136506,7 +138208,9 @@
 3653744896,3653744959,AE
 3653744960,3653746687,GB
 3653746688,3653750783,DE
-3653750784,3653754879,RU
+3653750784,3653753087,RU
+3653753088,3653753215,VG
+3653753216,3653754879,RU
 3653754880,3653758975,UA
 3653758976,3653763071,RU
 3653763072,3654025215,IT
@@ -136627,6 +138331,8 @@
 3664005120,3664005887,ID
 3664005888,3664006143,MY
 3664006144,3664006399,AU
+3664006400,3664006655,PF
+3664007168,3664008191,AU
 3664052224,3664084991,NZ
 3664084992,3664117759,KR
 3664117760,3664248831,HK
@@ -136765,6 +138471,7 @@
 3715655680,3715657727,IN
 3715657728,3715661823,SG
 3715661824,3715672063,AU
+3715672064,3715674111,JP
 3715674112,3715678207,HK
 3715678208,3715694591,PK
 3715694592,3715710975,VN
@@ -136784,7 +138491,7 @@
 3716431872,3716440063,KR
 3716440064,3716444159,JP
 3716444160,3716446207,PK
-3716448256,3716464639,JP
+3716446208,3716464639,JP
 3716464640,3716481023,ID
 3716481024,3716489215,VN
 3716489216,3716493311,MY
@@ -136862,7 +138569,7 @@
 3743006720,3743014911,TH
 3743014912,3743016959,AU
 3743019008,3743022079,MY
-3743022080,3743023103,AP
+3743022080,3743023103,SG
 3743023104,3743027199,TW
 3743027200,3743031295,SG
 3743031296,3743035391,IN
@@ -136898,7 +138605,7 @@
 3743285248,3743416319,IN
 3743416320,3745513471,KR
 3745513472,3749838847,CN
-3749838848,3749839103,AP
+3749838848,3749839871,SG
 3749839872,3749840895,IN
 3749840896,3749841919,PH
 3749841920,3749847039,AU

From 729f404efec0795f7ed358e7b2fa08bd62cc1ae8 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Jan 2011 12:07:34 -0500
Subject: [PATCH 30/47] Add logic in routerparse to not read overlong private
 keys

I am not at all sure that it is possible to trigger a bug here,
but better safe than sorry.
---
 src/common/crypto.c  | 14 ++++++++------
 src/common/crypto.h  |  2 +-
 src/or/routerparse.c |  2 +-
 src/or/test.c        |  6 +++---
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 334398033..da4e03edd 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -439,21 +439,23 @@ crypto_pk_generate_key(crypto_pk_env_t *env)
   return 0;
 }
 
-/** Read a PEM-encoded private key from the string <b>s</b> into <b>env</b>.
- * Return 0 on success, -1 on failure.
+/** Read a PEM-encoded private key from the <b>len</b>-byte string <b>s</b>
+ * into <b>env</b>.  Return 0 on success, -1 on failure.  If len is -1,
+ * the string is nul-terminated.
  */
 /* Used here, and used for testing. */
 int
 crypto_pk_read_private_key_from_string(crypto_pk_env_t *env,
-                                       const char *s)
+                                       const char *s, ssize_t len)
 {
   BIO *b;
 
   tor_assert(env);
   tor_assert(s);
+  tor_assert(len < INT_MAX && len < SIZE_T_CEILING);
 
-  /* Create a read-only memory BIO, backed by the NUL-terminated string 's' */
-  b = BIO_new_mem_buf((char*)s, -1);
+  /* Create a read-only memory BIO, backed by the string 's' */
+  b = BIO_new_mem_buf((char*)s, (int)len);
 
   if (env->key)
     RSA_free(env->key);
@@ -487,7 +489,7 @@ crypto_pk_read_private_key_from_filename(crypto_pk_env_t *env,
   }
 
   /* Try to parse it. */
-  r = crypto_pk_read_private_key_from_string(env, contents);
+  r = crypto_pk_read_private_key_from_string(env, contents, -1);
   tor_free(contents);
   if (r)
     return -1; /* read_private_key_from_string already warned, so we don't.*/
diff --git a/src/common/crypto.h b/src/common/crypto.h
index 4fb06be41..713a98827 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -82,7 +82,7 @@ int crypto_pk_write_private_key_to_string(crypto_pk_env_t *env,
 int crypto_pk_read_public_key_from_string(crypto_pk_env_t *env,
                                           const char *src, size_t len);
 int crypto_pk_read_private_key_from_string(crypto_pk_env_t *env,
-                                           const char *s);
+                                           const char *s, ssize_t len);
 int crypto_pk_write_private_key_to_filename(crypto_pk_env_t *env,
                                             const char *fname);
 
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index fc30c625b..6ca229337 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -3132,7 +3132,7 @@ get_next_token(memarea_t *area,
       RET_ERR("Couldn't parse public key.");
   } else if (!strcmp(tok->object_type, "RSA PRIVATE KEY")) { /* private key */
     tok->key = crypto_new_pk_env();
-    if (crypto_pk_read_private_key_from_string(tok->key, obstart))
+    if (crypto_pk_read_private_key_from_string(tok->key, obstart, eol-obstart))
       RET_ERR("Couldn't parse private key.");
   } else { /* If it's something else, try to base64-decode it */
     int r;
diff --git a/src/or/test.c b/src/or/test.c
index 66fa5604b..c4458d833 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -3361,11 +3361,11 @@ test_v3_networkstatus(void)
   sign_skey_leg1 = pk_generate(4);
 
   test_assert(!crypto_pk_read_private_key_from_string(sign_skey_1,
-                                                      AUTHORITY_SIGNKEY_1));
+                                                      AUTHORITY_SIGNKEY_1,-1));
   test_assert(!crypto_pk_read_private_key_from_string(sign_skey_2,
-                                                      AUTHORITY_SIGNKEY_2));
+                                                      AUTHORITY_SIGNKEY_2,-1));
   test_assert(!crypto_pk_read_private_key_from_string(sign_skey_3,
-                                                      AUTHORITY_SIGNKEY_3));
+                                                      AUTHORITY_SIGNKEY_3,-1));
 
   test_assert(!crypto_pk_cmp_keys(sign_skey_1, cert1->signing_key));
   test_assert(!crypto_pk_cmp_keys(sign_skey_2, cert2->signing_key));

From 373a1bc40e88d90e75f4a70b7d2018fe7288035a Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Jan 2011 12:12:11 -0500
Subject: [PATCH 31/47] Impose maximum sizes on parsed objects

An object, you'll recall, is something between -----BEGIN----- and
-----END----- tags in a directory document.  Some of our code, as
doorss has noted in bug 2352, could assert if one of these ever
overflowed SIZE_T_CEILING but not INT_MAX.  As a solution, I'm setting
a maximum size on a single object such that neither of these limits
will ever be hit.  I'm also fixing the INT_MAX checks, just to be sure.
---
 changes/bug2352      |  6 ++++++
 src/or/routerparse.c | 11 +++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 changes/bug2352

diff --git a/changes/bug2352 b/changes/bug2352
new file mode 100644
index 000000000..744dbdb20
--- /dev/null
+++ b/changes/bug2352
@@ -0,0 +1,6 @@
+  o Minor bugfixes
+    - Fix some potential asserts and partsing issues with grossly
+      malformed router caches.  Fixes bug 2352.  Found by doorss.
+      Bugfix on Tor 0.2.1.27.
+
+
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 6ca229337..070c61b1a 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -2549,7 +2549,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out,
         goto err;
       v->good_signature = 1;
     } else {
-      if (tok->object_size >= INT_MAX)
+      if (tok->object_size >= INT_MAX || tok->object_size >= SIZE_T_CEILING)
         goto err;
       /* We already parsed a vote from this voter. Use the first one. */
       if (v->signature) {
@@ -2700,7 +2700,7 @@ networkstatus_parse_detached_signatures(const char *s, const char *eos)
       voter = tor_malloc_zero(sizeof(networkstatus_voter_info_t));
       memcpy(voter->identity_digest, id_digest, DIGEST_LEN);
       memcpy(voter->signing_key_digest, sk_digest, DIGEST_LEN);
-      if (tok->object_size >= INT_MAX)
+      if (tok->object_size >= INT_MAX || tok->object_size >= SIZE_T_CEILING)
         goto err;
       voter->signature = tor_memdup(tok->object_body, tok->object_size);
       voter->signature_len = (int) tok->object_size;
@@ -3017,6 +3017,10 @@ static directory_token_t *
 get_next_token(memarea_t *area,
                const char **s, const char *eos, token_rule_t *table)
 {
+  /** Reject any object at least this big; it is probably an overflow, an
+   * attack, a bug, or some other nonsense. */
+#define MAX_UNPARSED_OBJECT_SIZE (128*1024)
+
   const char *next, *eol, *obstart;
   size_t obname_len;
   int i;
@@ -3126,6 +3130,9 @@ get_next_token(memarea_t *area,
     ebuf[sizeof(ebuf)-1] = '\0';
     RET_ERR(ebuf);
   }
+  if (next - *s > MAX_UNPARSED_OBJECT_SIZE)
+    RET_ERR("Couldn't parse object: missing footer or object much too big.");
+
   if (!strcmp(tok->object_type, "RSA PUBLIC KEY")) { /* If it's a public key */
     tok->key = crypto_new_pk_env();
     if (crypto_pk_read_public_key_from_string(tok->key, obstart, eol-obstart))

From bd67b23fec5f9312769b9abf26787f074db05217 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Jan 2011 16:18:32 -0500
Subject: [PATCH 32/47] Always nul-terminate the result passed to
 evdns_server_add_ptr_reply

In dnsserv_resolved(), we carefully made a nul-terminated copy of the
answer in a PTR RESOLVED cell... then never used that nul-terminated
copy.  Ouch.

Surprisingly this one isn't as huge a security problem as it could be.
The only place where the input to dnsserv_resolved wasn't necessarily
nul-terminated was when it was called indirectly from relay.c with the
contents of a relay cell's payload.  If the end of the payload was
filled with junk, eventdns.c would take the strdup() of the name [This
part is bad; we might crash there if the cell is in a bad part of the
stack or the heap] and get a name of at least length
495[*]. eventdns.c then rejects any name of length over 255, so the
bogus data would be neither transmitted nor altered.

  [*] If the name was less than 495 bytes long, the client wouldn't
     actually be reading off the end of the cell.

Nonetheless this is a reasonably annoying bug.  Better fix it.

Found while looking at bug 2332, reported by doorss.  Bugfix on
0.2.0.1-alpha.
---
 changes/bug2332  | 4 ++++
 src/or/dnsserv.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changes/bug2332

diff --git a/changes/bug2332 b/changes/bug2332
new file mode 100644
index 000000000..5f73ddd7a
--- /dev/null
+++ b/changes/bug2332
@@ -0,0 +1,4 @@
+  o Minor bugfixes
+    - Fix a bug with handling misformed replies to reverse DNS lookup
+      requests in DNSPort.  Bugfix on Tor 0.2.0.1-alpha.  Related to a bug
+      reported by doorss.
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index 579080be3..57c449311 100644
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -275,7 +275,7 @@ dnsserv_resolved(edge_connection_t *conn,
     char *ans = tor_strndup(answer, answer_len);
     evdns_server_request_add_ptr_reply(req, NULL,
                                        name,
-                                       (char*)answer, ttl);
+                                       ans, ttl);
     tor_free(ans);
   } else if (answer_type == RESOLVED_TYPE_ERROR) {
     err = DNS_ERR_NOTEXIST;

From 95968a625e91ae43aef9a4b810f93078dabe1419 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Jan 2011 16:44:42 -0500
Subject: [PATCH 33/47] Wait 60 minutes before retrying failed state save;
 bug2346

---
 changes/bug2346 | 5 +++++
 src/or/config.c | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 changes/bug2346

diff --git a/changes/bug2346 b/changes/bug2346
new file mode 100644
index 000000000..341b4f45b
--- /dev/null
+++ b/changes/bug2346
@@ -0,0 +1,5 @@
+  o Minor features
+    - If writing the state file to disk fails, wait an hour before
+      retrying again.  Fixes bug 2346.  Bugfix on Tor 0.1.1.3-alpha.
+
+
diff --git a/src/or/config.c b/src/or/config.c
index 17d776e71..5198eaa05 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5145,6 +5145,9 @@ or_state_load(void)
   return r;
 }
 
+/** If writing the state to disk fails, try again after this many seconds. */
+#define STATE_WRITE_RETRY_INTERVAL 3600
+
 /** Write the persistent state to disk. Return 0 for success, <0 on failure. */
 int
 or_state_save(time_t now)
@@ -5179,10 +5182,13 @@ or_state_save(time_t now)
   tor_free(state);
   fname = get_datadir_fname("state");
   if (write_str_to_file(fname, contents, 0)<0) {
-    log_warn(LD_FS, "Unable to write state to file \"%s\"", fname);
+    log_warn(LD_FS, "Unable to write state to file \"%s\"; will try later",
+             fname);
     global_state->LastWritten = -1;
     tor_free(fname);
     tor_free(contents);
+    /* Try again in after STATE_WRITE_RETRY_INTERVAL */
+    global_state->next_write = now + STATE_WRITE_RETRY_INTERVAL;
     return -1;
   }
 

From aa45e8259368c9733e459dc4f91f62492b9926da Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Jan 2011 17:24:16 -0500
Subject: [PATCH 34/47] Pull up more data when parsing socks messages

Previously, we only looked at up to 128 bytes.  This is a bad idea
since socks messages can be at least 256+x bytes long.  Now we look at
up to 512 bytes; this should be enough for 0.2.2.x to handle all valid
SOCKS messages.  For 0.2.3.x, we can think about handling trickier
cases.

Fixes 2330.  Bugfix on 0.2.0.16-alpha.
---
 changes/bug2330  | 7 +++++++
 src/or/buffers.c | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 changes/bug2330

diff --git a/changes/bug2330 b/changes/bug2330
new file mode 100644
index 000000000..fc0c4d8c3
--- /dev/null
+++ b/changes/bug2330
@@ -0,0 +1,7 @@
+  o Minor bugfixes
+    - Handle SOCKS messages longer than 128 bytes long correctly, rather
+      than waiting forever for them to finish.  Fixes bug 2330.  Bugfix on
+      0.2.0.16-alpha.  Found by doorss.
+
+
+
diff --git a/src/or/buffers.c b/src/or/buffers.c
index 2a8838250..de0c219e8 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1336,6 +1336,10 @@ log_unsafe_socks_warning(int socks_protocol, const char *address,
                               socks_protocol, address, (int)port);
 }
 
+/** Do not attempt to parse socks messages longer than this.  This value is
+ * actually significantly higher than the longest possible socks message. */
+#define MAX_SOCKS_MESSAGE_LEN 512
+
 /** There is a (possibly incomplete) socks handshake on <b>buf</b>, of one
  * of the forms
  *  - socks4: "socksheader username\\0"
@@ -1377,7 +1381,7 @@ fetch_from_buf_socks(buf_t *buf, socks_request_t *req,
   if (buf->datalen < 2) /* version and another byte */
     return 0;
 
-  buf_pullup(buf, 128, 0);
+  buf_pullup(buf, MAX_SOCKS_MESSAGE_LEN, 0);
   tor_assert(buf->head && buf->head->datalen >= 2);
 
   socksver = *buf->head->data;

From 2dd7df8308ec962700b1a4311cd675f668631c90 Mon Sep 17 00:00:00 2001
From: Sebastian Hahn <sebastian@torproject.org>
Date: Wed, 12 Jan 2011 04:02:24 +0100
Subject: [PATCH 35/47] Fix a autoconf warning

---
 configure.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 394be9e82..1d1a1794e 100644
--- a/configure.in
+++ b/configure.in
@@ -549,11 +549,11 @@ if test "$tor_cv_time_t_signed" != no; then
 fi
 
 AC_CACHE_CHECK([whether size_t is signed], tor_cv_size_t_signed, [
-AC_RUN_IFELSE(AC_LANG_SOURCE([
+AC_RUN_IFELSE([AC_LANG_SOURCE([
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-int main(int c, char**v) { if (((size_t)-1)<0) return 1; else return 0; }]),
+int main(int c, char**v) { if (((size_t)-1)<0) return 1; else return 0; }])],
   tor_cv_size_t_signed=no, tor_cv_size_t_signed=yes, tor_cv_size_t_signed=cross)
 ])
 

From 5044cb9752b4414cadcdc3b12926b005e390fdf0 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 12 Jan 2011 12:37:42 -0500
Subject: [PATCH 36/47] Explain bug2346 fix better based on suggestions from
 arma

---
 changes/bug2346 | 5 +++--
 src/or/config.c | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/changes/bug2346 b/changes/bug2346
index 341b4f45b..0f78b8461 100644
--- a/changes/bug2346
+++ b/changes/bug2346
@@ -1,5 +1,6 @@
   o Minor features
-    - If writing the state file to disk fails, wait an hour before
-      retrying again.  Fixes bug 2346.  Bugfix on Tor 0.1.1.3-alpha.
+    - If writing the state file to disk fails, wait up to an hour
+      before retrying again.  (Our old code would retry the write
+      immediately.)  Fixes bug 2346.  Bugfix on Tor 0.1.1.3-alpha.
 
 
diff --git a/src/or/config.c b/src/or/config.c
index 5198eaa05..a27fd22b2 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5187,7 +5187,8 @@ or_state_save(time_t now)
     global_state->LastWritten = -1;
     tor_free(fname);
     tor_free(contents);
-    /* Try again in after STATE_WRITE_RETRY_INTERVAL */
+    /* Try again after STATE_WRITE_RETRY_INTERVAL (or sooner, if the state
+     * changes sooner). */
     global_state->next_write = now + STATE_WRITE_RETRY_INTERVAL;
     return -1;
   }

From f4756051feb2ee57fbe3b5e285b012a922fef6c3 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 12 Jan 2011 12:42:21 -0500
Subject: [PATCH 37/47] add a missing "not" in bug2331 changelog

---
 changes/bug2331 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/changes/bug2331 b/changes/bug2331
index df97ac2b4..9940b591c 100644
--- a/changes/bug2331
+++ b/changes/bug2331
@@ -1,6 +1,7 @@
   o Minor bugfixes:
     - Add assertions to check for overflow in arguments to
       base32_encode and base32_decode; fix a signed-unsigned
-      comparison there too.  These bugs are actually reachable in Tor,
-      but it's good to prevent future errors too.  Found by doorss.
+      comparison there too.  These bugs are not actually reachable in
+      Tor, but it's good to prevent future errors too.  Found by
+      doorss.
 

From 9fcc14224b689dff1be8336feeeb563199694c27 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 12 Jan 2011 14:29:38 -0500
Subject: [PATCH 38/47] Make our replacement INT32_MAX always signed

The C standard says that INT32_MAX is supposed to be a signed
integer.  On platforms that have it, we get the correct
platform-defined value.  Our own replacement, however, was
unsigned.  That's going to cause a bug somewhere eventually.
---
 src/common/torint.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/torint.h b/src/common/torint.h
index 4970dcd67..2a9fba6fc 100644
--- a/src/common/torint.h
+++ b/src/common/torint.h
@@ -115,7 +115,7 @@ typedef unsigned int uint32_t;
 #define UINT32_MAX 0xffffffffu
 #endif
 #ifndef INT32_MAX
-#define INT32_MAX 0x7fffffffu
+#define INT32_MAX 0x7fffffff
 #endif
 #endif
 

From b27f5cc50d4a66bff31e43a596eb296a1b5a11dc Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 15 Jan 2011 10:23:58 -0500
Subject: [PATCH 39/47] Fix another instance of "128" in buffers.c.  More
 bug2330.

---
 src/or/buffers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/buffers.c b/src/or/buffers.c
index de0c219e8..9a30a7b59 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1670,7 +1670,7 @@ fetch_from_buf_socks_client(buf_t *buf, int state, char **reason)
   if (buf->datalen < 2)
     return 0;
 
-  buf_pullup(buf, 128, 0);
+  buf_pullup(buf, MAX_SOCKS_MESSAGE_LEN, 0);
   tor_assert(buf->head && buf->head->datalen >= 2);
 
   data = (unsigned char *) buf->head->data;

From 1f3b4420233e83ef160ac41398827994ec7ae152 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 15 Jan 2011 10:42:11 -0500
Subject: [PATCH 40/47] catch another overlong malloc possibility. found by
 cypherpunks

---
 src/or/routerparse.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 070c61b1a..3aaefec68 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -3105,7 +3105,8 @@ get_next_token(memarea_t *area,
 
   obstart = *s; /* Set obstart to start of object spec */
   if (*s+16 >= eol || memchr(*s+11,'\0',eol-*s-16) || /* no short lines, */
-      strcmp_len(eol-5, "-----", 5)) {          /* nuls or invalid endings */
+      strcmp_len(eol-5, "-----", 5) ||           /* nuls or invalid endings */
+      (eol-*s) > MAX_UNPARSED_OBJECT_SIZE) {     /* name too long */
     RET_ERR("Malformed object: bad begin line");
   }
   tok->object_type = STRNDUP(*s+11, eol-*s-16);

From a16902b9d4b0a912eb0a252bb945cbeaaa40dacb Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Jan 2011 16:18:32 -0500
Subject: [PATCH 41/47] Always nul-terminate the result passed to
 evdns_server_add_ptr_reply

In dnsserv_resolved(), we carefully made a nul-terminated copy of the
answer in a PTR RESOLVED cell... then never used that nul-terminated
copy.  Ouch.

Surprisingly this one isn't as huge a security problem as it could be.
The only place where the input to dnsserv_resolved wasn't necessarily
nul-terminated was when it was called indirectly from relay.c with the
contents of a relay cell's payload.  If the end of the payload was
filled with junk, eventdns.c would take the strdup() of the name [This
part is bad; we might crash there if the cell is in a bad part of the
stack or the heap] and get a name of at least length
495[*]. eventdns.c then rejects any name of length over 255, so the
bogus data would be neither transmitted nor altered.

  [*] If the name was less than 495 bytes long, the client wouldn't
     actually be reading off the end of the cell.

Nonetheless this is a reasonably annoying bug.  Better fix it.

Found while looking at bug 2332, reported by doorss.  Bugfix on
0.2.0.1-alpha.
---
 changes/bug2332  | 4 ++++
 src/or/dnsserv.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changes/bug2332

diff --git a/changes/bug2332 b/changes/bug2332
new file mode 100644
index 000000000..5f73ddd7a
--- /dev/null
+++ b/changes/bug2332
@@ -0,0 +1,4 @@
+  o Minor bugfixes
+    - Fix a bug with handling misformed replies to reverse DNS lookup
+      requests in DNSPort.  Bugfix on Tor 0.2.0.1-alpha.  Related to a bug
+      reported by doorss.
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index 579080be3..57c449311 100644
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -275,7 +275,7 @@ dnsserv_resolved(edge_connection_t *conn,
     char *ans = tor_strndup(answer, answer_len);
     evdns_server_request_add_ptr_reply(req, NULL,
                                        name,
-                                       (char*)answer, ttl);
+                                       ans, ttl);
     tor_free(ans);
   } else if (answer_type == RESOLVED_TYPE_ERROR) {
     err = DNS_ERR_NOTEXIST;

From 115782bdbe42e4b3d5cb386d2939a883bc381d12 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 13 Jan 2011 14:36:41 -0500
Subject: [PATCH 42/47] Fix a heap overflow found by debuger, and make it
 harder to make that mistake again

Our public key functions assumed that they were always writing into a
large enough buffer.  In one case, they weren't.

(Incorporates fixes from sebastian)
---
 changes/tolen_asserts  |  9 +++++++
 src/common/crypto.c    | 53 +++++++++++++++++++++++++++++++++---------
 src/common/crypto.h    | 12 ++++++----
 src/or/config.c        |  3 ++-
 src/or/networkstatus.c |  1 +
 src/or/onion.c         |  2 ++
 src/or/rendclient.c    |  1 +
 src/or/rendcommon.c    |  4 +++-
 src/or/rendservice.c   |  6 +++--
 src/or/routerlist.c    |  3 ++-
 src/or/routerparse.c   | 16 ++++++++-----
 src/or/test.c          | 37 +++++++++++++++++------------
 12 files changed, 105 insertions(+), 42 deletions(-)
 create mode 100644 changes/tolen_asserts

diff --git a/changes/tolen_asserts b/changes/tolen_asserts
new file mode 100644
index 000000000..90cdb2d75
--- /dev/null
+++ b/changes/tolen_asserts
@@ -0,0 +1,9 @@
+  o Major bugfixes (security)
+    - Fix a heap overflow bug where an adversary could cause heap
+      corruption.  Since the contents of the corruption would need to be
+      the output of an RSA decryption, we do not think this is easy to
+      turn in to a remote code execution attack, but everybody should
+      upgrade anyway.  Found by debuger.  Bugfix on 0.1.2.10-rc.
+  o Defensive programming
+    - Introduce output size checks on all of our decryption functions.
+
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 334398033..7cb849a64 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -717,9 +717,12 @@ crypto_pk_copy_full(crypto_pk_env_t *env)
  * in <b>env</b>, using the padding method <b>padding</b>.  On success,
  * write the result to <b>to</b>, and return the number of bytes
  * written.  On failure, return -1.
+ *
+ * <b>tolen</b> is the number of writable bytes in <b>to</b>, and must be
+ * at least the length of the modulus of <b>env</b>.
  */
 int
-crypto_pk_public_encrypt(crypto_pk_env_t *env, char *to,
+crypto_pk_public_encrypt(crypto_pk_env_t *env, char *to, size_t tolen,
                          const char *from, size_t fromlen, int padding)
 {
   int r;
@@ -727,6 +730,7 @@ crypto_pk_public_encrypt(crypto_pk_env_t *env, char *to,
   tor_assert(from);
   tor_assert(to);
   tor_assert(fromlen<INT_MAX);
+  tor_assert(tolen >= crypto_pk_keysize(env));
 
   r = RSA_public_encrypt((int)fromlen,
                          (unsigned char*)from, (unsigned char*)to,
@@ -742,9 +746,13 @@ crypto_pk_public_encrypt(crypto_pk_env_t *env, char *to,
  * in <b>env</b>, using the padding method <b>padding</b>.  On success,
  * write the result to <b>to</b>, and return the number of bytes
  * written.  On failure, return -1.
+ *
+ * <b>tolen</b> is the number of writable bytes in <b>to</b>, and must be
+ * at least the length of the modulus of <b>env</b>.
  */
 int
 crypto_pk_private_decrypt(crypto_pk_env_t *env, char *to,
+                          size_t tolen,
                           const char *from, size_t fromlen,
                           int padding, int warnOnFailure)
 {
@@ -754,6 +762,7 @@ crypto_pk_private_decrypt(crypto_pk_env_t *env, char *to,
   tor_assert(to);
   tor_assert(env->key);
   tor_assert(fromlen<INT_MAX);
+  tor_assert(tolen >= crypto_pk_keysize(env));
   if (!env->key->p)
     /* Not a private key */
     return -1;
@@ -774,9 +783,13 @@ crypto_pk_private_decrypt(crypto_pk_env_t *env, char *to,
  * public key in <b>env</b>, using PKCS1 padding.  On success, write the
  * signed data to <b>to</b>, and return the number of bytes written.
  * On failure, return -1.
+ *
+ * <b>tolen</b> is the number of writable bytes in <b>to</b>, and must be
+ * at least the length of the modulus of <b>env</b>.
  */
 int
 crypto_pk_public_checksig(crypto_pk_env_t *env, char *to,
+                          size_t tolen,
                           const char *from, size_t fromlen)
 {
   int r;
@@ -784,6 +797,7 @@ crypto_pk_public_checksig(crypto_pk_env_t *env, char *to,
   tor_assert(from);
   tor_assert(to);
   tor_assert(fromlen < INT_MAX);
+  tor_assert(tolen >= crypto_pk_keysize(env));
   r = RSA_public_decrypt((int)fromlen,
                          (unsigned char*)from, (unsigned char*)to,
                          env->key, RSA_PKCS1_PADDING);
@@ -806,6 +820,7 @@ crypto_pk_public_checksig_digest(crypto_pk_env_t *env, const char *data,
 {
   char digest[DIGEST_LEN];
   char *buf;
+  size_t buflen;
   int r;
 
   tor_assert(env);
@@ -818,8 +833,9 @@ crypto_pk_public_checksig_digest(crypto_pk_env_t *env, const char *data,
     log_warn(LD_BUG, "couldn't compute digest");
     return -1;
   }
-  buf = tor_malloc(crypto_pk_keysize(env)+1);
-  r = crypto_pk_public_checksig(env,buf,sig,siglen);
+  buflen = crypto_pk_keysize(env)+1;
+  buf = tor_malloc(buflen);
+  r = crypto_pk_public_checksig(env,buf,buflen,sig,siglen);
   if (r != DIGEST_LEN) {
     log_warn(LD_CRYPTO, "Invalid signature");
     tor_free(buf);
@@ -839,9 +855,12 @@ crypto_pk_public_checksig_digest(crypto_pk_env_t *env, const char *data,
  * <b>env</b>, using PKCS1 padding.  On success, write the signature to
  * <b>to</b>, and return the number of bytes written.  On failure, return
  * -1.
+ *
+ * <b>tolen</b> is the number of writable bytes in <b>to</b>, and must be
+ * at least the length of the modulus of <b>env</b>.
  */
 int
-crypto_pk_private_sign(crypto_pk_env_t *env, char *to,
+crypto_pk_private_sign(crypto_pk_env_t *env, char *to, size_t tolen,
                        const char *from, size_t fromlen)
 {
   int r;
@@ -849,6 +868,7 @@ crypto_pk_private_sign(crypto_pk_env_t *env, char *to,
   tor_assert(from);
   tor_assert(to);
   tor_assert(fromlen < INT_MAX);
+  tor_assert(tolen >= crypto_pk_keysize(env));
   if (!env->key->p)
     /* Not a private key */
     return -1;
@@ -867,16 +887,19 @@ crypto_pk_private_sign(crypto_pk_env_t *env, char *to,
  * <b>from</b>; sign the data with the private key in <b>env</b>, and
  * store it in <b>to</b>.  Return the number of bytes written on
  * success, and -1 on failure.
+ *
+ * <b>tolen</b> is the number of writable bytes in <b>to</b>, and must be
+ * at least the length of the modulus of <b>env</b>.
  */
 int
-crypto_pk_private_sign_digest(crypto_pk_env_t *env, char *to,
+crypto_pk_private_sign_digest(crypto_pk_env_t *env, char *to, size_t tolen,
                               const char *from, size_t fromlen)
 {
   int r;
   char digest[DIGEST_LEN];
   if (crypto_digest(digest,from,fromlen)<0)
     return -1;
-  r = crypto_pk_private_sign(env,to,digest,DIGEST_LEN);
+  r = crypto_pk_private_sign(env,to,tolen,digest,DIGEST_LEN);
   memset(digest, 0, sizeof(digest));
   return r;
 }
@@ -900,7 +923,7 @@ crypto_pk_private_sign_digest(crypto_pk_env_t *env, char *to,
  */
 int
 crypto_pk_public_hybrid_encrypt(crypto_pk_env_t *env,
-                                char *to,
+                                char *to, size_t tolen,
                                 const char *from,
                                 size_t fromlen,
                                 int padding, int force)
@@ -923,8 +946,13 @@ crypto_pk_public_hybrid_encrypt(crypto_pk_env_t *env,
 
   if (!force && fromlen+overhead <= pkeylen) {
     /* It all fits in a single encrypt. */
-    return crypto_pk_public_encrypt(env,to,from,fromlen,padding);
+    return crypto_pk_public_encrypt(env,to,
+                                    tolen,
+                                    from,fromlen,padding);
   }
+  tor_assert(tolen >= fromlen + overhead + CIPHER_KEY_LEN);
+  tor_assert(tolen >= pkeylen);
+
   cipher = crypto_new_cipher_env();
   if (!cipher) return -1;
   if (crypto_cipher_generate_key(cipher)<0)
@@ -946,7 +974,7 @@ crypto_pk_public_hybrid_encrypt(crypto_pk_env_t *env,
   /* Length of symmetrically encrypted data. */
   symlen = fromlen-(pkeylen-overhead-CIPHER_KEY_LEN);
 
-  outlen = crypto_pk_public_encrypt(env,to,buf,pkeylen-overhead,padding);
+  outlen = crypto_pk_public_encrypt(env,to,tolen,buf,pkeylen-overhead,padding);
   if (outlen!=(int)pkeylen) {
     goto err;
   }
@@ -972,6 +1000,7 @@ crypto_pk_public_hybrid_encrypt(crypto_pk_env_t *env,
 int
 crypto_pk_private_hybrid_decrypt(crypto_pk_env_t *env,
                                  char *to,
+                                 size_t tolen,
                                  const char *from,
                                  size_t fromlen,
                                  int padding, int warnOnFailure)
@@ -985,11 +1014,12 @@ crypto_pk_private_hybrid_decrypt(crypto_pk_env_t *env,
   pkeylen = crypto_pk_keysize(env);
 
   if (fromlen <= pkeylen) {
-    return crypto_pk_private_decrypt(env,to,from,fromlen,padding,
+    return crypto_pk_private_decrypt(env,to,tolen,from,fromlen,padding,
                                      warnOnFailure);
   }
+
   buf = tor_malloc(pkeylen+1);
-  outlen = crypto_pk_private_decrypt(env,buf,from,pkeylen,padding,
+  outlen = crypto_pk_private_decrypt(env,buf,pkeylen+1,from,pkeylen,padding,
                                      warnOnFailure);
   if (outlen<0) {
     log_fn(warnOnFailure?LOG_WARN:LOG_DEBUG, LD_CRYPTO,
@@ -1007,6 +1037,7 @@ crypto_pk_private_hybrid_decrypt(crypto_pk_env_t *env,
   }
   memcpy(to,buf+CIPHER_KEY_LEN,outlen-CIPHER_KEY_LEN);
   outlen -= CIPHER_KEY_LEN;
+  tor_assert(tolen - outlen >= fromlen - pkeylen);
   r = crypto_cipher_decrypt(cipher, to+outlen, from+pkeylen, fromlen-pkeylen);
   if (r<0)
     goto err;
diff --git a/src/common/crypto.h b/src/common/crypto.h
index 4fb06be41..9cfb41444 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -93,23 +93,25 @@ crypto_pk_env_t *crypto_pk_dup_key(crypto_pk_env_t *orig);
 crypto_pk_env_t *crypto_pk_copy_full(crypto_pk_env_t *orig);
 int crypto_pk_key_is_private(const crypto_pk_env_t *key);
 
-int crypto_pk_public_encrypt(crypto_pk_env_t *env, char *to,
+int crypto_pk_public_encrypt(crypto_pk_env_t *env, char *to, size_t tolen,
                              const char *from, size_t fromlen, int padding);
-int crypto_pk_private_decrypt(crypto_pk_env_t *env, char *to,
+int crypto_pk_private_decrypt(crypto_pk_env_t *env, char *to, size_t tolen,
                               const char *from, size_t fromlen,
                               int padding, int warnOnFailure);
-int crypto_pk_public_checksig(crypto_pk_env_t *env, char *to,
+int crypto_pk_public_checksig(crypto_pk_env_t *env, char *to, size_t tolen,
                               const char *from, size_t fromlen);
 int crypto_pk_public_checksig_digest(crypto_pk_env_t *env, const char *data,
                                size_t datalen, const char *sig, size_t siglen);
-int crypto_pk_private_sign(crypto_pk_env_t *env, char *to,
+int crypto_pk_private_sign(crypto_pk_env_t *env, char *to, size_t tolen,
                            const char *from, size_t fromlen);
-int crypto_pk_private_sign_digest(crypto_pk_env_t *env, char *to,
+int crypto_pk_private_sign_digest(crypto_pk_env_t *env, char *to, size_t tolen,
                                   const char *from, size_t fromlen);
 int crypto_pk_public_hybrid_encrypt(crypto_pk_env_t *env, char *to,
+                                    size_t tolen,
                                     const char *from, size_t fromlen,
                                     int padding, int force);
 int crypto_pk_private_hybrid_decrypt(crypto_pk_env_t *env, char *to,
+                                     size_t tolen,
                                      const char *from, size_t fromlen,
                                      int padding, int warnOnFailure);
 
diff --git a/src/or/config.c b/src/or/config.c
index 45f611457..f8cfd29f8 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5321,7 +5321,8 @@ or_state_save(time_t now)
   tor_free(state);
   fname = get_datadir_fname("state");
   if (write_str_to_file(fname, contents, 0)<0) {
-    log_warn(LD_FS, "Unable to write state to file \"%s\"", fname);
+    log_warn(LD_FS, "Unable to write state to file \"%s\"; "
+             "will try again later", fname);
     tor_free(fname);
     tor_free(contents);
     return -1;
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 53e8a63ea..7106294d5 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -362,6 +362,7 @@ networkstatus_check_voter_signature(networkstatus_t *consensus,
   signed_digest = tor_malloc(signed_digest_len);
   if (crypto_pk_public_checksig(cert->signing_key,
                                 signed_digest,
+                                signed_digest_len,
                                 voter->signature,
                                 voter->signature_len) != DIGEST_LEN ||
       memcmp(signed_digest, consensus->networkstatus_digest, DIGEST_LEN)) {
diff --git a/src/or/onion.c b/src/or/onion.c
index 45c75b071..bf72b4cab 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -188,6 +188,7 @@ onion_skin_create(crypto_pk_env_t *dest_router_key,
 
   /* set meeting point, meeting cookie, etc here. Leave zero for now. */
   if (crypto_pk_public_hybrid_encrypt(dest_router_key, onion_skin_out,
+                                      ONIONSKIN_CHALLENGE_LEN,
                                       challenge, DH_KEY_LEN,
                                       PK_PKCS1_OAEP_PADDING, 1)<0)
     goto err;
@@ -230,6 +231,7 @@ onion_skin_server_handshake(const char *onion_skin, /*ONIONSKIN_CHALLENGE_LEN*/
       break;
     note_crypto_pk_op(DEC_ONIONSKIN);
     len = crypto_pk_private_hybrid_decrypt(k, challenge,
+                                           ONIONSKIN_CHALLENGE_LEN,
                                            onion_skin, ONIONSKIN_CHALLENGE_LEN,
                                            PK_PKCS1_OAEP_PADDING,0);
     if (len>0)
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index edd24d8a3..ab18d3529 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -193,6 +193,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
   /*XXX maybe give crypto_pk_public_hybrid_encrypt a max_len arg,
    * to avoid buffer overflows? */
   r = crypto_pk_public_hybrid_encrypt(intro_key, payload+DIGEST_LEN,
+                                      sizeof(payload)-DIGEST_LEN,
                                       tmp,
                                       (int)(dh_offset+DH_KEY_LEN),
                                       PK_PKCS1_OAEP_PADDING, 0);
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 1d96f3daf..d6f544381 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -700,7 +700,9 @@ rend_encode_service_descriptor(rend_service_descriptor_t *desc,
     cp += ipoint_len+1;
   }
   note_crypto_pk_op(REND_SERVER);
-  r = crypto_pk_private_sign_digest(key, cp, *str_out, cp-*str_out);
+  r = crypto_pk_private_sign_digest(key,
+                                    cp, buflen - (cp - *str_out),
+                                    *str_out, cp-*str_out);
   if (r<0) {
     tor_free(*str_out);
     return -1;
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 9035ea473..07f01aead 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -979,7 +979,8 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request,
   /* Next N bytes is encrypted with service key */
   note_crypto_pk_op(REND_SERVER);
   r = crypto_pk_private_hybrid_decrypt(
-       intro_key,buf,(char*)(request+DIGEST_LEN),request_len-DIGEST_LEN,
+       intro_key,buf,sizeof(buf),
+       (char*)(request+DIGEST_LEN),request_len-DIGEST_LEN,
        PK_PKCS1_OAEP_PADDING,1);
   if (r<0) {
     log_warn(LD_PROTOCOL, "Couldn't decrypt INTRODUCE2 cell.");
@@ -1424,7 +1425,8 @@ rend_service_intro_has_opened(origin_circuit_t *circuit)
     goto err;
   len += 20;
   note_crypto_pk_op(REND_SERVER);
-  r = crypto_pk_private_sign_digest(intro_key, buf+len, buf, len);
+  r = crypto_pk_private_sign_digest(intro_key, buf+len, sizeof(buf)-len,
+                                    buf, len);
   if (r<0) {
     log_warn(LD_BUG, "Internal error: couldn't sign introduction request.");
     reason = END_CIRC_REASON_INTERNAL;
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index c6c84a877..7c8e36e40 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4676,7 +4676,8 @@ routerinfo_incompatible_with_extrainfo(routerinfo_t *ri, extrainfo_t *ei,
 
   if (ei->pending_sig) {
     char signed_digest[128];
-    if (crypto_pk_public_checksig(ri->identity_pkey, signed_digest,
+    if (crypto_pk_public_checksig(ri->identity_pkey,
+                       signed_digest, sizeof(signed_digest),
                        ei->pending_sig, ei->pending_sig_len) != DIGEST_LEN ||
         memcmp(signed_digest, ei->cache_info.signed_descriptor_digest,
                DIGEST_LEN)) {
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index fc30c625b..9ad84ed8d 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -571,10 +571,12 @@ router_append_dirobj_signature(char *buf, size_t buf_len, const char *digest,
                                crypto_pk_env_t *private_key)
 {
   char *signature;
-  size_t i;
+  size_t i, keysize;
 
-  signature = tor_malloc(crypto_pk_keysize(private_key));
-  if (crypto_pk_private_sign(private_key, signature, digest, DIGEST_LEN) < 0) {
+  keysize = crypto_pk_keysize(private_key);
+  signature = tor_malloc(keysize);
+  if (crypto_pk_private_sign(private_key, signature, keysize,
+                             digest, DIGEST_LEN) < 0) {
 
     log_warn(LD_BUG,"Couldn't sign digest.");
     goto err;
@@ -924,6 +926,7 @@ check_signature_token(const char *digest,
                       const char *doctype)
 {
   char *signed_digest;
+  size_t keysize;
   const int check_authority = (flags & CST_CHECK_AUTHORITY);
   const int check_objtype = ! (flags & CST_NO_CHECK_OBJTYPE);
 
@@ -945,9 +948,10 @@ check_signature_token(const char *digest,
     }
   }
 
-  signed_digest = tor_malloc(tok->object_size);
-  if (crypto_pk_public_checksig(pkey, signed_digest, tok->object_body,
-                                tok->object_size)
+  keysize = crypto_pk_keysize(pkey);
+  signed_digest = tor_malloc(keysize);
+  if (crypto_pk_public_checksig(pkey, signed_digest, keysize,
+                                tok->object_body, tok->object_size)
       != DIGEST_LEN) {
     log_warn(LD_DIR, "Error reading %s: invalid signature.", doctype);
     tor_free(signed_digest);
diff --git a/src/or/test.c b/src/or/test.c
index 66fa5604b..103866b45 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -701,25 +701,27 @@ test_crypto_pk(void)
   test_eq(128, crypto_pk_keysize(pk1));
   test_eq(128, crypto_pk_keysize(pk2));
 
-  test_eq(128, crypto_pk_public_encrypt(pk2, data1, "Hello whirled.", 15,
+  test_eq(128, crypto_pk_public_encrypt(pk2, data1, sizeof(data1),
+                                        "Hello whirled.", 15,
                                         PK_PKCS1_OAEP_PADDING));
-  test_eq(128, crypto_pk_public_encrypt(pk1, data2, "Hello whirled.", 15,
+  test_eq(128, crypto_pk_public_encrypt(pk1, data2, sizeof(data2),
+                                        "Hello whirled.", 15,
                                         PK_PKCS1_OAEP_PADDING));
   /* oaep padding should make encryption not match */
   test_memneq(data1, data2, 128);
-  test_eq(15, crypto_pk_private_decrypt(pk1, data3, data1, 128,
+  test_eq(15, crypto_pk_private_decrypt(pk1, data3, sizeof(data3), data1, 128,
                                         PK_PKCS1_OAEP_PADDING,1));
   test_streq(data3, "Hello whirled.");
   memset(data3, 0, 1024);
-  test_eq(15, crypto_pk_private_decrypt(pk1, data3, data2, 128,
+  test_eq(15, crypto_pk_private_decrypt(pk1, data3, sizeof(data3), data2, 128,
                                         PK_PKCS1_OAEP_PADDING,1));
   test_streq(data3, "Hello whirled.");
   /* Can't decrypt with public key. */
-  test_eq(-1, crypto_pk_private_decrypt(pk2, data3, data2, 128,
+  test_eq(-1, crypto_pk_private_decrypt(pk2, data3, sizeof(data3), data2, 128,
                                         PK_PKCS1_OAEP_PADDING,1));
   /* Try again with bad padding */
   memcpy(data2+1, "XYZZY", 5);  /* This has fails ~ once-in-2^40 */
-  test_eq(-1, crypto_pk_private_decrypt(pk1, data3, data2, 128,
+  test_eq(-1, crypto_pk_private_decrypt(pk1, data3, sizeof(data3), data2, 128,
                                         PK_PKCS1_OAEP_PADDING,1));
 
   /* File operations: save and load private key */
@@ -734,19 +736,22 @@ test_crypto_pk(void)
                                                    get_fname("xyzzy")) < 0);
   test_assert(! crypto_pk_read_private_key_from_filename(pk2,
                                                          get_fname("pkey1")));
-  test_eq(15, crypto_pk_private_decrypt(pk2, data3, data1, 128,
+  test_eq(15, crypto_pk_private_decrypt(pk2, data3, sizeof(data3), data1, 128,
                                         PK_PKCS1_OAEP_PADDING,1));
 
   /* Now try signing. */
   strlcpy(data1, "Ossifrage", 1024);
-  test_eq(128, crypto_pk_private_sign(pk1, data2, data1, 10));
-  test_eq(10, crypto_pk_public_checksig(pk1, data3, data2, 128));
+  test_eq(128, crypto_pk_private_sign(pk1, data2, sizeof(data2), data1, 10));
+  test_eq(10, crypto_pk_public_checksig(pk1, data3, sizeof(data3), data2, 128));
   test_streq(data3, "Ossifrage");
   /* Try signing digests. */
-  test_eq(128, crypto_pk_private_sign_digest(pk1, data2, data1, 10));
-  test_eq(20, crypto_pk_public_checksig(pk1, data3, data2, 128));
-  test_eq(0, crypto_pk_public_checksig_digest(pk1, data1, 10, data2, 128));
-  test_eq(-1, crypto_pk_public_checksig_digest(pk1, data1, 11, data2, 128));
+  test_eq(128, crypto_pk_private_sign_digest(pk1, data2, sizeof(data2),
+                                             data1, 10));
+  test_eq(20, crypto_pk_public_checksig(pk1, data3, sizeof(data1), data2, 128));
+  test_eq(0, crypto_pk_public_checksig_digest(pk1, data1,
+                                              10, data2, 128));
+  test_eq(-1, crypto_pk_public_checksig_digest(pk1, data1,
+                                               11, data2, 128));
   /*XXXX test failed signing*/
 
   /* Try encoding */
@@ -767,9 +772,11 @@ test_crypto_pk(void)
         continue;
       p = (i==0)?PK_NO_PADDING:
         (i==1)?PK_PKCS1_PADDING:PK_PKCS1_OAEP_PADDING;
-      len = crypto_pk_public_hybrid_encrypt(pk1,data2,data1,j,p,0);
+      len = crypto_pk_public_hybrid_encrypt(pk1,data2,sizeof(data2),
+                                            data1,j,p,0);
       test_assert(len>=0);
-      len = crypto_pk_private_hybrid_decrypt(pk1,data3,data2,len,p,1);
+      len = crypto_pk_private_hybrid_decrypt(pk1,data3,sizeof(data3),
+                                             data2,len,p,1);
       test_eq(len,j);
       test_memeq(data1,data3,j);
     }

From 50b06a2b76190170e9f80739f022696755b54b99 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 15 Jan 2011 10:54:58 -0500
Subject: [PATCH 43/47] make the description of tolen_asserts more dire

We have a CVE # for this bug.
---
 changes/tolen_asserts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/changes/tolen_asserts b/changes/tolen_asserts
index 90cdb2d75..a9834ab66 100644
--- a/changes/tolen_asserts
+++ b/changes/tolen_asserts
@@ -1,9 +1,8 @@
   o Major bugfixes (security)
     - Fix a heap overflow bug where an adversary could cause heap
-      corruption.  Since the contents of the corruption would need to be
-      the output of an RSA decryption, we do not think this is easy to
-      turn in to a remote code execution attack, but everybody should
-      upgrade anyway.  Found by debuger.  Bugfix on 0.1.2.10-rc.
+      corruption.  This bug potentially allows remote code execution
+      attacks.  Found by debuger.  Fixes CVE-2011-0427.  Bugfix on
+      0.1.2.10-rc.
   o Defensive programming
     - Introduce output size checks on all of our decryption functions.
 

From 1fcfc186284a375bab2595162564f0dd6c1d19f0 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 15 Jan 2011 12:12:10 -0500
Subject: [PATCH 44/47] clean up message; explain a magic number in a comment

---
 src/common/torgzip.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/common/torgzip.c b/src/common/torgzip.c
index 767866877..249151cc9 100644
--- a/src/common/torgzip.c
+++ b/src/common/torgzip.c
@@ -58,9 +58,18 @@ method_bits(compress_method_t method)
 }
 
 /* These macros define the maximum allowable compression factor.  Anything of
- * size greater than <b>check_for_compression_bomb_after</b> is not allowed to
+ * size greater than CHECK_FOR_COMPRESSION_BOMB_AFTER is not allowed to
  * have an uncompression factor (uncompressed size:compressed size ratio) of
- * any greater than MAX_UNCOMPRESSION_FACTOR. */
+ * any greater than MAX_UNCOMPRESSION_FACTOR.
+ *
+ * Picking a value for MAX_UNCOMPRESSION_FACTOR is a trade-off: we want it to
+ * be small to limit the attack multiplier, but we also want it to be large
+ * enough so that no legitimate document --even ones we might invent in the
+ * future -- ever compresses by a factor of greater than
+ * MAX_UNCOMPRESSION_FACTOR. Within those parameters, there's a reasonably
+ * large range of possible values. IMO, anything over 8 is probably safe; IMO
+ * anything under 50 is probably sufficient.
+ */
 #define MAX_UNCOMPRESSION_FACTOR 25
 #define CHECK_FOR_COMPRESSION_BOMB_AFTER (1024*64)
 
@@ -291,7 +300,7 @@ tor_gzip_uncompress(char **out, size_t *out_len,
           goto err;
         }
         if (is_compression_bomb(in_len, out_size)) {
-          log_warn(LD_GENERAL, "Input looks look a possible zlib bomb; "
+          log_warn(LD_GENERAL, "Input looks like a possible zlib bomb; "
                    "not proceeding.");
           goto err;
         }

From 31b562e10abe51cf9d520e0a3ad2ffc3277d52a4 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 15 Jan 2011 13:09:12 -0500
Subject: [PATCH 45/47] Add missing check for hostname answer_len in dnsserv
 size

This is checked elsewhere too, but let's be RFC-conformant.
---
 src/or/dnsserv.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index 57c449311..f8b5c3cdd 100644
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -271,6 +271,7 @@ dnsserv_resolved(edge_connection_t *conn,
                                      name,
                                      1, (char*)answer, ttl);
   } else if (answer_type == RESOLVED_TYPE_HOSTNAME &&
+             answer_len < 256 &&
              conn->socks_request->command == SOCKS_COMMAND_RESOLVE_PTR) {
     char *ans = tor_strndup(answer, answer_len);
     evdns_server_request_add_ptr_reply(req, NULL,

From 9b09627edd2e1dcaed4ca8382bde3cf608ce6a81 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 15 Jan 2011 11:22:25 -0500
Subject: [PATCH 46/47] Zero out some more key data before freeing it

Found by cypherpunks; fixes bug 2384.
---
 changes/bug2384     |  5 +++++
 src/common/crypto.c | 12 +++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 changes/bug2384

diff --git a/changes/bug2384 b/changes/bug2384
new file mode 100644
index 000000000..532181442
--- /dev/null
+++ b/changes/bug2384
@@ -0,0 +1,5 @@
+  o Minor bugfixes
+    - Zero out a few more keys in memory before freeing them.  Fixes bug
+      2384.  Found by cypherpunks.  Bugfix on 0.0.2pre9.
+
+
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 208e1c5fe..29137a834 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -490,6 +490,7 @@ crypto_pk_read_private_key_from_filename(crypto_pk_env_t *env,
 
   /* Try to parse it. */
   r = crypto_pk_read_private_key_from_string(env, contents, -1);
+  memset(contents, 0, strlen(contents));
   tor_free(contents);
   if (r)
     return -1; /* read_private_key_from_string already warned, so we don't.*/
@@ -627,6 +628,7 @@ crypto_pk_write_private_key_to_filename(crypto_pk_env_t *env,
   s[len]='\0';
   r = write_str_to_file(fname, s, 0);
   BIO_free(bio);
+  memset(s, 0, strlen(s));
   tor_free(s);
   return r;
 }
@@ -1688,7 +1690,7 @@ crypto_dh_compute_secret(crypto_dh_env_t *dh,
 {
   char *secret_tmp = NULL;
   BIGNUM *pubkey_bn = NULL;
-  size_t secret_len=0;
+  size_t secret_len=0, secret_tmp_len=0;
   int result=0;
   tor_assert(dh);
   tor_assert(secret_bytes_out/DIGEST_LEN <= 255);
@@ -1702,7 +1704,8 @@ crypto_dh_compute_secret(crypto_dh_env_t *dh,
     log_warn(LD_CRYPTO,"Rejected invalid g^x");
     goto error;
   }
-  secret_tmp = tor_malloc(crypto_dh_get_bytes(dh));
+  secret_tmp_len = crypto_dh_get_bytes(dh);
+  secret_tmp = tor_malloc(secret_tmp_len);
   result = DH_compute_key((unsigned char*)secret_tmp, pubkey_bn, dh->dh);
   if (result < 0) {
     log_warn(LD_CRYPTO,"DH_compute_key() failed.");
@@ -1721,7 +1724,10 @@ crypto_dh_compute_secret(crypto_dh_env_t *dh,
   crypto_log_errors(LOG_WARN, "completing DH handshake");
   if (pubkey_bn)
     BN_free(pubkey_bn);
-  tor_free(secret_tmp);
+  if (secret_tmp) {
+    memset(secret_tmp, 0, secret_tmp_len);
+    tor_free(secret_tmp);
+  }
   if (result < 0)
     return result;
   else

From ef6fa07e4830dde86fce2d06bf9da44d5c1c79b9 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 15 Jan 2011 11:32:56 -0500
Subject: [PATCH 47/47] Fix a couple of non-cleared key issues in hidden
 services

we need to do more hunting, but this fixes the ones mentioned in 2385.
---
 changes/bug2384      | 3 ++-
 src/or/rendclient.c  | 2 ++
 src/or/rendservice.c | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug2384 b/changes/bug2384
index 532181442..ded5eee99 100644
--- a/changes/bug2384
+++ b/changes/bug2384
@@ -1,5 +1,6 @@
   o Minor bugfixes
     - Zero out a few more keys in memory before freeing them.  Fixes bug
-      2384.  Found by cypherpunks.  Bugfix on 0.0.2pre9.
+      2384 and part of bug 2385.  These key instances found by
+      "cypherpunks".  Bugfix on 0.0.2pre9.
 
 
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index ab18d3529..95875465c 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -717,8 +717,10 @@ rend_client_receive_rendezvous(origin_circuit_t *circ, const uint8_t *request,
    * attach only the connections that are waiting on this circuit, rather
    * than trying to attach them all. See comments bug 743. */
   connection_ap_attach_pending();
+  memset(keys, 0, sizeof(keys));
   return 0;
  err:
+  memset(keys, 0, sizeof(keys));
   circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL);
   return -1;
 }
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 07f01aead..a650eda40 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1214,8 +1214,10 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request,
   memcpy(cpath->handshake_digest, keys, DIGEST_LEN);
   if (extend_info) extend_info_free(extend_info);
 
+  memset(keys, 0, sizeof(keys));
   return 0;
  err:
+  memset(keys, 0, sizeof(keys));
   if (dh) crypto_dh_free(dh);
   if (launched)
     circuit_mark_for_close(TO_CIRCUIT(launched), reason);