Merge branch 'master' of github.com:XX-net/XX-Net

README.md

@@ -1,6 +1,6 @@
 
 
-XX-Net - A Rebirth of Goagent
+XX-Net - A Reborn of Goagent
 ========
 翻墙工具套件 A firewall circumvention toolkit
 * GAE proxy, 稳定、易用、快速  

gae_proxy/local/ip_range.txt

@@ -90,10 +90,12 @@
 36.68.81.0-36.68.81.255
 36.68.95.0-36.68.95.255
 36.68.98.0-36.68.98.255
+36.68.127.0-36.68.127.255
 36.75.19.0-36.75.20.255
 36.75.24.0-36.75.25.255
 36.76.169.0-36.76.169.255
 36.76.171.0-36.76.171.255
+36.82.34.0-36.82.34.255
 36.82.44.0-36.82.44.255
 36.82.232.0-36.82.232.255
 36.83.26.0-36.83.26.255
@@ -160,6 +162,7 @@
 49.98.24.0-49.98.25.255
 49.98.35.0-49.98.35.255
 49.106.234.0-49.106.234.255
+49.231.60.0-49.231.60.255
 49.243.141.0-49.243.141.255
 50.0.2.0-50.0.2.255
 50.22.229.0-50.22.229.255
@@ -169,6 +172,7 @@
 58.27.27.0-58.27.27.255
 58.27.61.0-58.27.61.255
 58.27.108.0-58.27.109.255
+58.69.77.0-58.69.77.255
 58.123.102.0-58.123.102.255
 58.145.238.0-58.145.238.255
 58.162.16.0-58.162.16.255
@@ -188,6 +192,7 @@
 61.41.59.0-61.41.59.255
 61.47.115.0-61.47.115.255
 61.86.203.0-61.86.203.255
+61.91.8.0-61.91.8.255
 61.91.18.0-61.91.18.255
 61.114.99.0-61.114.99.255
 61.122.213.0-61.122.213.255
@@ -196,7 +201,6 @@
 61.238.203.0-61.238.203.255
 61.238.239.0-61.238.239.255
 61.245.3.0-61.245.3.255
-62.0.54.0-62.0.54.255
 62.1.38.0-62.1.38.255
 62.8.95.0-62.8.95.255
 62.20.124.0-62.20.124.255
@@ -273,6 +277,7 @@
 66.76.34.0-66.76.34.255
 66.76.194.0-66.76.194.255
 66.76.246.0-66.76.246.255
+66.96.224.0-66.96.224.255
 66.97.30.0-66.97.30.255
 66.102.0.0-66.102.255.255
 66.112.178.0-66.112.178.255
@@ -483,6 +488,7 @@
 91.230.210.0-91.230.210.255
 91.245.214.0-91.245.214.255
 92.45.86.0-92.45.86.255
+92.46.70.0-92.46.70.255
 92.53.32.0-92.53.32.255
 92.87.156.0-92.87.156.255
 92.87.232.0-92.87.232.255
@@ -493,7 +499,6 @@
 93.88.162.0-93.88.163.255
 93.89.223.0-93.89.223.255
 93.91.155.0-93.91.155.255
-93.94.217.0-93.94.218.255
 93.123.23.0-93.123.23.255
 93.183.211.0-93.183.211.255
 93.191.15.0-93.191.15.255
@@ -505,7 +510,6 @@
 94.129.130.0-94.129.130.255
 94.140.100.0-94.140.100.255
 94.156.188.0-94.156.188.255
-94.200.103.0-94.200.103.255
 94.232.220.0-94.232.220.255
 94.236.232.0-94.236.232.255
 94.245.201.0-94.245.201.255
@@ -613,9 +617,7 @@
 111.94.248.0-111.94.248.255
 111.107.254.0-111.107.254.255
 111.168.255.0-111.168.255.255
-112.215.60.0-112.215.60.255
 113.21.24.0-113.21.24.255
-113.21.241.0-113.21.241.255
 113.171.18.0-113.171.19.255
 113.171.241.0-113.171.247.255
 113.171.251.0-113.171.252.255
@@ -649,7 +651,8 @@
 118.107.75.0-118.107.75.255
 118.107.111.0-118.107.111.255
 118.143.88.0-118.143.88.255
-118.174.24.0-118.174.27.255
+118.174.25.0-118.174.25.255
+118.174.27.0-118.174.27.255
 119.15.80.0-119.15.80.255
 119.66.145.0-119.66.145.255
 119.81.142.0-119.81.142.255
@@ -658,6 +661,7 @@
 119.149.188.0-119.149.188.255
 119.161.83.0-119.161.83.255
 119.235.103.0-119.235.103.255
+120.28.5.0-120.28.5.255
 121.78.52.0-121.78.52.255
 121.78.71.0-121.78.71.255
 121.78.74.0-121.78.74.255
@@ -848,6 +852,7 @@
 180.235.254.0-180.235.254.255
 180.241.39.0-180.241.39.255
 180.246.148.0-180.246.148.255
+180.248.129.0-180.248.129.255
 180.248.135.0-180.248.135.255
 180.251.67.0-180.251.67.255
 181.15.96.0-181.15.96.255
@@ -1050,7 +1055,6 @@
 192.124.233.0-192.124.233.255
 192.154.121.0-192.154.121.255
 192.158.28.0-192.158.31.255
-192.178.0.0-192.179.255.255
 192.193.133.0-192.193.133.255
 192.200.224.0-192.200.255.255
 192.232.16.0-192.232.16.255
@@ -1280,7 +1284,6 @@
 202.152.130.0-202.152.130.255
 202.152.192.0-202.152.192.255
 202.158.57.0-202.158.57.255
-202.159.216.0-202.159.216.255
 202.163.174.0-202.163.174.255
 202.169.173.0-202.169.173.255
 202.169.175.0-202.169.175.255
@@ -1307,6 +1310,7 @@
 203.116.165.0-203.116.165.255
 203.117.34.0-203.117.37.255
 203.133.8.0-203.133.8.255
+203.133.72.0-203.133.72.255
 203.139.206.0-203.139.206.255
 203.146.98.0-203.146.98.255
 203.151.116.0-203.151.116.255
@@ -1318,6 +1322,7 @@
 203.210.2.0-203.210.2.255
 203.210.4.0-203.210.4.255
 203.211.0.0-203.211.0.255
+203.211.8.0-203.211.8.255
 203.217.98.0-203.217.98.255
 203.233.10.0-203.233.10.255
 203.233.18.0-203.233.18.255
@@ -1494,7 +1499,8 @@
 216.21.160.0-216.21.175.255
 216.33.229.0-216.33.229.255
 216.50.166.0-216.50.166.255
-216.58.192.0-216.58.223.255
+216.58.192.0-216.58.195.255
+216.58.197.0-216.58.207.255
 216.59.116.0-216.59.116.255
 216.68.10.0-216.68.10.255
 216.68.248.0-216.68.248.255
@@ -1557,4 +1563,4 @@
 223.27.237.0-223.27.237.255
 223.62.225.0-223.62.225.255
 223.196.4.0-223.196.4.255
-223.196.82.0-223.196.82.255
+223.196.82.0-223.196.82.255

gae_proxy/web_ui/config.html

@@ -103,7 +103,7 @@
 </form> <!-- #gae_proxy-config -->
 
         <div class="row-fluid">
-            <div class="span4">
+            <div class="span12">
                 {{ _( "Advanced tricks:" ) }}: <a href="https://github.com/XX-net/XX-Net/wiki/GoAgent-manual-config" target="_blank">{{ _( "By the configuration file" ) }}</a>
             </div> <!-- .span4 -->
         </div> <!-- .row-fluid -->