Merge pull request #1766

72deb484 updated fallback nodes (Riccardo Spagni)
33329f5b update version to 0.10.2 (Riccardo Spagni)
04a50a7e update checkpoints.dat (Riccardo Spagni)
c3599fa7 update copyright year, fix occasional lack of newline at line end (Riccardo Spagni)

14 files changed, 26 insertions, 20 deletions

diff --git a/src/p2p/CMakeLists.txt b/src/p2p/CMakeLists.txt
index 6ef008baf..0704940b5 100644
--- a/src/p2p/CMakeLists.txt
+++ b/src/p2p/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2016, The Monero Project
+# Copyright (c) 2014-2017, The Monero Project
 #
 # All rights reserved.
 #
diff --git a/src/p2p/connection_basic.cpp b/src/p2p/connection_basic.cpp
index bdb239ca8..df34379e2 100644
--- a/src/p2p/connection_basic.cpp
+++ b/src/p2p/connection_basic.cpp
@@ -2,7 +2,7 @@
 /// @author rfree (current maintainer in monero.cc project)
 /// @brief base for connection, contains e.g. the ratelimit hooks
 
-// Copyright (c) 2014-2016, The Monero Project
+// Copyright (c) 2014-2017, The Monero Project
 // 
 // All rights reserved.
 // 
diff --git a/src/p2p/connection_basic.hpp b/src/p2p/connection_basic.hpp
index 5452fa6fb..bea2df1cd 100644
--- a/src/p2p/connection_basic.hpp
+++ b/src/p2p/connection_basic.hpp
@@ -8,7 +8,7 @@
 // ! (how ever if in some wonderful juristdictions that is not the case, then why not make another sub-class withat that members and licence it as epee part)
 // ! Working on above premise, IF this is valid in your juristdictions, then consider this code as released as:
 
-// Copyright (c) 2014-2016, The Monero Project
+// Copyright (c) 2014-2017, The Monero Project
 // 
 // All rights reserved.
 // 
diff --git a/src/p2p/net_node.h b/src/p2p/net_node.h
index 4243e35f1..de0cf2c03 100644
--- a/src/p2p/net_node.h
+++ b/src/p2p/net_node.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2016, The Monero Project
+// Copyright (c) 2014-2017, The Monero Project
 //
 // All rights reserved.
 //
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index 9f87326a0..c40bd8c5d 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2016, The Monero Project
+// Copyright (c) 2014-2017, The Monero Project
 //
 // All rights reserved.
 //
@@ -406,9 +406,11 @@ namespace nodetool
     if (testnet)
     {
       memcpy(&m_network_id, &::config::testnet::NETWORK_ID, 16);
-      full_addrs.insert("163.172.182.165:28080");
-      full_addrs.insert("204.12.248.66:28080");
+      full_addrs.insert("212.83.175.67:28080");
       full_addrs.insert("5.9.100.248:28080");
+      full_addrs.insert("163.172.182.165:28080");
+      full_addrs.insert("195.154.123.123:28080");
+      full_addrs.insert("212.83.172.165:28080");
     }
     else
     {
@@ -484,11 +486,15 @@ namespace nodetool
       if (!full_addrs.size())
       {
         MINFO("DNS seed node lookup either timed out or failed, falling back to defaults");
-        full_addrs.insert("198.74.231.92:18080");
-        full_addrs.insert("161.67.132.39:18080");
-        full_addrs.insert("163.172.182.165:18080");
-        full_addrs.insert("204.12.248.66:18080");
+
+        full_addrs.insert("107.152.130.98:18080");
+        full_addrs.insert("212.83.175.67:18080");
         full_addrs.insert("5.9.100.248:18080");
+        full_addrs.insert("163.172.182.165:18080");
+        full_addrs.insert("161.67.132.39:18080");
+        full_addrs.insert("198.74.231.92:18080");
+        full_addrs.insert("195.154.123.123:28080");
+        full_addrs.insert("212.83.172.165:28080");
       }
     }
 
diff --git a/src/p2p/net_node_common.h b/src/p2p/net_node_common.h
index 69bee890c..6aba7aa24 100644
--- a/src/p2p/net_node_common.h
+++ b/src/p2p/net_node_common.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2016, The Monero Project
+// Copyright (c) 2014-2017, The Monero Project
 // 
 // All rights reserved.
 // 
diff --git a/src/p2p/net_peerlist.h b/src/p2p/net_peerlist.h
index c73d6615d..6b999207b 100644
--- a/src/p2p/net_peerlist.h
+++ b/src/p2p/net_peerlist.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2016, The Monero Project
+// Copyright (c) 2014-2017, The Monero Project
 // 
 // All rights reserved.
 // 
diff --git a/src/p2p/net_peerlist_boost_serialization.h b/src/p2p/net_peerlist_boost_serialization.h
index d9a11728b..260f16919 100644
--- a/src/p2p/net_peerlist_boost_serialization.h
+++ b/src/p2p/net_peerlist_boost_serialization.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2016, The Monero Project
+// Copyright (c) 2014-2017, The Monero Project
 // 
 // All rights reserved.
 // 
diff --git a/src/p2p/network_throttle-detail.cpp b/src/p2p/network_throttle-detail.cpp
index 2c8bdabea..0747b6f36 100644
--- a/src/p2p/network_throttle-detail.cpp
+++ b/src/p2p/network_throttle-detail.cpp
@@ -2,7 +2,7 @@
 /// @author rfree (current maintainer in monero.cc project)
 /// @brief implementaion for throttling of connection (count and rate-limit speed etc)
 
-// Copyright (c) 2014-2016, The Monero Project
+// Copyright (c) 2014-2017, The Monero Project
 // 
 // All rights reserved.
 // 
diff --git a/src/p2p/network_throttle-detail.hpp b/src/p2p/network_throttle-detail.hpp
index ef7227eb9..c514db450 100644
--- a/src/p2p/network_throttle-detail.hpp
+++ b/src/p2p/network_throttle-detail.hpp
@@ -2,7 +2,7 @@
 /// @author rfree (current maintainer in monero.cc project)
 /// @brief implementaion for throttling of connection (count and rate-limit speed etc)
 
-// Copyright (c) 2014-2016, The Monero Project
+// Copyright (c) 2014-2017, The Monero Project
 // 
 // All rights reserved.
 // 
diff --git a/src/p2p/network_throttle.cpp b/src/p2p/network_throttle.cpp
index 30538bb3c..6d68f3286 100644
--- a/src/p2p/network_throttle.cpp
+++ b/src/p2p/network_throttle.cpp
@@ -26,7 +26,7 @@ Throttling work by:
 
 */
 
-// Copyright (c) 2014-2016, The Monero Project
+// Copyright (c) 2014-2017, The Monero Project
 // 
 // All rights reserved.
 // 
diff --git a/src/p2p/network_throttle.hpp b/src/p2p/network_throttle.hpp
index 4f6cbe9cf..a747cdd71 100644
--- a/src/p2p/network_throttle.hpp
+++ b/src/p2p/network_throttle.hpp
@@ -2,7 +2,7 @@
 /// @author rfree (current maintainer in monero.cc project)
 /// @brief interface for throttling of connection (count and rate-limit speed etc)
 
-// Copyright (c) 2014-2016, The Monero Project
+// Copyright (c) 2014-2017, The Monero Project
 // 
 // All rights reserved.
 // 
diff --git a/src/p2p/p2p_protocol_defs.h b/src/p2p/p2p_protocol_defs.h
index 6d6ac7b98..97e75f5ca 100644
--- a/src/p2p/p2p_protocol_defs.h
+++ b/src/p2p/p2p_protocol_defs.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2016, The Monero Project
+// Copyright (c) 2014-2017, The Monero Project
 // 
 // All rights reserved.
 // 
diff --git a/src/p2p/stdafx.h b/src/p2p/stdafx.h
index 77daa484d..5e9baa895 100644
--- a/src/p2p/stdafx.h
+++ b/src/p2p/stdafx.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2014-2016, The Monero Project
+// Copyright (c) 2014-2017, The Monero Project
 // 
 // All rights reserved.
 //