[tor-commits] [trunnel/master] Bump version to 1.3
commit 1fb393e00ee0897f2660abe4d2d286159faec094 Author: Nick Mathewson Date: Wed Oct 1 23:45:44 2014 -0400 Bump version to 1.3 --- lib/trunnel/__init__.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/trunnel/__init__.py b/lib/trunnel/__init__.py index b072e9a..a29d78b 100644 --- a/lib/trunnel/__init__.py +++ b/lib/trunnel/__init__.py @@ -3,5 +3,5 @@ # a package. # -__version__ = "1.2" +__version__ = "1.3" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser-bundle/master] Update FTE bridges, add IPv6 bridges.
commit 91c19fd898d25ba10d4531b91eb1591a08f1779c
Author: Mike Perry
Date: Wed Oct 1 20:19:52 2014 -0700
Update FTE bridges, add IPv6 bridges.
---
Bundle-Data/PTConfigs/bridge_prefs.js | 17 +
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js
b/Bundle-Data/PTConfigs/bridge_prefs.js
index b04e84e..a17a1be 100644
--- a/Bundle-Data/PTConfigs/bridge_prefs.js
+++ b/Bundle-Data/PTConfigs/bridge_prefs.js
@@ -16,14 +16,15 @@ pref("extensions.torlauncher.default_bridge.flashproxy.3",
"flashproxy 0.0.1.0:3
pref("extensions.torlauncher.default_bridge.flashproxy.4", "flashproxy
0.0.1.0:4");
pref("extensions.torlauncher.default_bridge.flashproxy.5", "flashproxy
0.0.1.0:5");
-//
-pref("extensions.torlauncher.default_bridge.fte.1", "fte 54.244.94.118:80
6E6298B85B171FEA4E36ADB15D6FF95DA0B37C89");
-pref("extensions.torlauncher.default_bridge.fte.2", "fte 131.252.210.150:8080
0E858AC201BF0F3FA3C462F64844CBFFC7297A42");
-pref("extensions.torlauncher.default_bridge.fte.3", "fte 128.105.214.161:8080
1E326AAFB3FCB515015250D8FCCC8E37F91A153B");
-pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.162:8080
FC562097E1951DCC41B7D7F324D88157119BB56D");
-pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.163:8080
A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9");
-pref("extensions.torlauncher.default_bridge.fte.6", "fte 79.125.3.12:8080
272465348803EE2546A9BB8EE37D462915531F09");
-//
+pref("extensions.torlauncher.default_bridge.fte.1", "fte 192.240.101.106:80
B629B0B607C8AC9349B5646C24E9D242184F5B6E");
+pref("extensions.torlauncher.default_bridge.fte.2", "fte 50.7.176.114:80
2BD466989944867075E872310EBAD65BC88C8AEF");
+pref("extensions.torlauncher.default_bridge.fte.3", "fte 131.252.210.150:8080
0E858AC201BF0F3FA3C462F64844CBFFC7297A42");
+pref("extensions.torlauncher.default_bridge.fte.4", "fte 128.105.214.161:8080
1E326AAFB3FCB515015250D8FCCC8E37F91A153B");
+pref("extensions.torlauncher.default_bridge.fte.5", "fte 128.105.214.162:8080
FC562097E1951DCC41B7D7F324D88157119BB56D");
+pref("extensions.torlauncher.default_bridge.fte.6", "fte 128.105.214.163:8080
A17A40775FBD2CA1184BF80BFC330A77ECF9D0E9");
+
+pref("extensions.torlauncher.default_bridge.fte-ipv6.1", "fte
[2001:49f0:d002:1::2]:80 B629B0B607C8AC9349B5646C24E9D242184F5B6E");
+pref("extensions.torlauncher.default_bridge.fte-ipv6.2", "fte
[2001:49f0:d00a:1::c]:80 2BD466989944867075E872310EBAD65BC88C8AEF");
pref("extensions.torlauncher.default_bridge.scramblesuit.1", "scramblesuit
188.40.121.112:39707 5DE8D363D8F150C99E1A2D7237368D614838132C
password=L5POGQONBPS2HZUR6GXBIDS4CMIYYOTI");
pref("extensions.torlauncher.default_bridge.scramblesuit.2", "scramblesuit
188.226.213.208:54278 AA5A86C1490296EF4FACA946CC5A182FCD1C5B1E
password=MD2VRP7WXAMSG7MKIGMHI4CB4BMSNO7T");
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r26965: {website} update more mirrors. (website/trunk/include)
Author: phobos Date: 2014-10-02 01:17:04 + (Thu, 02 Oct 2014) New Revision: 26965 Modified: website/trunk/include/tor-mirrors.csv Log: update more mirrors. Modified: website/trunk/include/tor-mirrors.csv === --- website/trunk/include/tor-mirrors.csv 2014-10-02 01:15:43 UTC (rev 26964) +++ website/trunk/include/tor-mirrors.csv 2014-10-02 01:17:04 UTC (rev 26965) @@ -31,7 +31,7 @@ haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, FALSE, No, http://tor.zilog.es/, , , , http://tor.zilog.es/dist/, , , , Mon Sep 29 23:44:59 2014 Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Mon Sep 29 23:44:59 2014 margus.random at mail.ee, CyberSIDE, EE, Estonia, EE, TRUE, FALSE, No, http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Mon Sep 29 23:44:59 2014 -Tor Fan, torproject.is, IS, Iceland, IS, TRUE, FALSE, No, http://torproject.is/, , , , http://torproject.is/dist/, , , , Mon Sep 29 23:44:59 2014 +Tor Fan, torproject.is, IS, Iceland, IS, TRUE, FALSE, No, http://www.torproject.is/, , , , http://www.torproject.is/dist/, , , , Mon Sep 29 23:44:59 2014 Tor Fan, spline, DE, Germany, DE, TRUE, FALSE, No, http://tor.spline.de/, https://tor.spline.inf.fu-berlin.de/, rsync://ftp.spline.de/tor, ftp://ftp.spline.de/pub/tor, http://tor.spline.de/dist/, https://tor.spline.inf.fu-berlin.de/dist/, rsync://ftp.spline.de/tor/dist, , Mon Sep 29 23:44:59 2014 Tor Fan, me0w.cc, RO, Romania, RO, TRUE, FALSE, No, http://tor.me0w.cc/, , , , http://tor.me0w.cc/dist/, , , , Mon Sep 29 23:44:59 2014 Tor Fan, borgmann.tv, DE, Germany, DE, TRUE, FALSE, No, http://tor.borgmann.tv/, , , , http://tor.borgmann.tv/dist/, , , , Mon Sep 29 23:44:59 2014 @@ -49,7 +49,7 @@ Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, No, http://tor.linuxlounge.net/, https://tor.linuxlounge.net/, , , http://tor.linuxlounge.net/dist/, https://tor.linuxlounge.net/dist/, , , Mon Sep 29 23:44:59 2014 paul at coffswifi.net, CoffsWiFi, AU, Australia and New Zealand, APNIC, TRUE, FALSE, No, http://torproject.coffswifi.net, , , , http://torproject.coffswifi.net/dist, , , , Mon Sep 29 23:44:59 2014 Tor Fan, cyberarmy, AT, Austria, AT, TRUE, FALSE, No, http://tor.cyberarmy.at/, , , , , , , , Mon Sep 29 23:44:59 2014 -hostmaster AT zombiewerks DOT com, TheOnionRouter, IS, Iceland, Iceland, TRUE, FALSE, No, http://theonionrouter.com/, , , , http://theonionrouter.com/dist/, , , , Mon Sep 29 23:44:59 2014 +hostmaster AT example DOT com, TheOnionRouter, IS, Iceland, Iceland, TRUE, FALSE, No, http://www.theonionrouter.com/, , , , http://www.theonionrouter.com/dist/, , , , Mon Sep 29 23:44:59 2014 Tor Fan, crazyhaze.de, DE, Germany, DE, TRUE, FALSE, No, http://tor.crazyhaze.de/, https://tor.crazyhaze.de/, , , http://tor.crazyhaze.de/dist/, https://tor.crazyhaze.de/dist/, , , Mon Sep 29 23:44:59 2014 Tor Fan, chaos darmstadt, DE, Germany, Europe, TRUE, FALSE, No, http://mirrors.chaos-darmstadt.de/tor-mirror/, , , , http://mirrors.chaos-darmstadt.de/tor-mirror/dist/, , , , Mon Sep 29 23:44:59 2014 Tor Fan, Soviet Anonymous, RU, Russia, RU, TRUE, FALSE, No, http://creep.im/tor, https://creep.im/tor, rsync://creep.im/tor, ftp://creep.im/mirrors/tor, http://creep.im/tor/dist/, https://creep.im/tor/dist/, rsync://creep.im/tor-dist, , Mon Sep 29 23:44:59 2014 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r26964: {website} update mirror status. (website/trunk/include)
Author: phobos Date: 2014-10-02 01:15:43 + (Thu, 02 Oct 2014) New Revision: 26964 Modified: website/trunk/include/mirrors-table.wmi website/trunk/include/tor-mirrors.csv Log: update mirror status. Modified: website/trunk/include/mirrors-table.wmi === --- website/trunk/include/mirrors-table.wmi 2014-09-30 13:04:36 UTC (rev 26963) +++ website/trunk/include/mirrors-table.wmi 2014-10-02 01:15:43 UTC (rev 26964) @@ -137,6 +137,23 @@ + EE + + CyberSIDE + + Up to date + + - +http://cyberside.net.ee/tor/";>http +http://cyberside.planet.ee/tor/";>http + - + - + - + - + + + + DE spline @@ -273,6 +290,40 @@ + US + + AskApache + + Up to date + + - +http://tor.askapache.com/dist/";>http +http://tor.askapache.com/";>http + - + - + - + - + + + + + FR + + Tor Supporter + + Up to date + + - +http://tor.mirror.chekanov.net/dist/";>http +http://tor.mirror.chekanov.net/";>http + - + - + - + - + + + + AT TechAsk.IT @@ -360,34 +411,17 @@ DE - Tor Supporter + crazyhaze.de Up to date - -http://torproject.cryptowars.info/dist/";>http -http://torproject.cryptowars.info/";>http -https://torproject.cryptowars.info/dist/";>https -https://torproject.cryptowars.info/";>https +http://tor.crazyhaze.de/dist/";>http +http://tor.crazyhaze.de/";>http +https://tor.crazyhaze.de/dist/";>https +https://tor.crazyhaze.de/";>https - -rsync - - - - - IS - - TheOnionRouter - - Up to date - - -http://theonionrouter.com/dist/";>http -http://theonionrouter.com/";>http - - - - - - - - @@ -494,6 +528,23 @@ + DE + + Userzap + + Up to date + + - +http://torprojekt.userzap.de/dist/";>http +http://torprojekt.userzap.de";>http +https://torprojekt.userzap.de/dist/";>https +https://torprojekt.userzap.de";>https + - + - + + + + US EPRCI @@ -664,6 +715,23 @@ + DE + + Tor Supporter + + Up to date + + - +http://reichster.de/mirrors/torproject.org/dist/";>http +http://reichster.de/mirrors/torproject.org/";>http +https://reichster.de/mirrors/torproject.org/dist/";>https +https://reichster.de/mirrors/torproject.org";>https + - + - + + + + US Evil Routers @@ -868,23 +936,6 @@ - NL - - BBLN - - Up to date - -ftp://mirror2.bbln.org/torproject/";>ftp -http://mirror2.bbln.org/torproject/dist/";>http -http://mirror2.bbln.org/torproject/";>http -https://mirror2.bbln.org/torproject/dist/";>https -https://mirror2.bbln.org/torproject/";>https -rsync -rsync - - - - FR BBLN @@ -1021,40 +1072,6 @@ - US - - AskApache - - Up to date - - - -http://tor.askapache.com/dist/";>http -http://tor.askapache.com/";>http - - - - - - - - - - - - - FR - - Tor Supporter - - Up to date - - - -http://tor.mirror.chekanov.net/dist/";>http -http://tor.mirror.chekanov.net/";>http - - - - - - - - - - - - NL Amorphis @@ -1072,51 +1089,17 @@ - DE + NL - crazyhaze.de + BBLN Up to date - - -http://tor.crazyhaze.de/dist/";>http -http://tor.crazyhaze.de/";>http -https://tor.crazyhaze.de/dist/";>https -https://tor.crazyhaze.de/";>https - - - - +ftp://mirror2.bbln.org/torproject/";>ftp +http://mirror2.bbln.org/torproject/dist/";>http +http://mirror2.bbln.org/torproject/";>http +https://mirror2.bbln.org/torproject/dist/";>https +https://mirror2.bbln.org/torproject/";>https +rsync +rsync - - - - DE - - Userzap - - Up to date - - - -http://torprojekt.userzap.de/dist/";>http -http://torprojekt.userzap.de";>http -https://torprojekt.userzap.de/dist/";>https -https://torprojekt.userzap.de";>https - - - - - - - - - DE - - Tor Supporter - - Up to date - - - -http://reichster.de/mirrors/torproject.org/dist/";>http -http://reichster.de/mirrors/torproject.org/";>http -https://reichster.de/mirrors/torproject.org/dist/";>https -https://reichster.de/mirrors/torproject.org";>https - - - - - Modified: website/trunk/include/tor-mirrors.csv === --- website/trunk/include/tor-mirrors.csv 2014-09-30 13:04:3
[tor-commits] [tor-browser/tor-browser-31.1.1esr-4.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
commit 4c65088331460f35e4ec117a90f9a2bd7793e85b
Author: Mike Perry
Date: Wed Oct 1 15:29:04 2014 -0700
fixup! TB4: Tor Browser's Firefox preference overrides.
Address Lunar's comments from tor-qa.
---
browser/app/profile/000-tor-browser.js |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/browser/app/profile/000-tor-browser.js
b/browser/app/profile/000-tor-browser.js
index 2d21fe8..0a16f35 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -65,7 +65,7 @@ pref("general.appname.override", "Netscape");
pref("general.appversion.override", "5.0 (Windows)");
pref("general.oscpu.override", "Windows NT 6.1");
pref("general.platform.override", "Win32");
-pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:24.0)
Gecko/20100101 Firefox/24.0");
+pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:31.0)
Gecko/20100101 Firefox/31.0");
pref("general.productSub.override", "20100101");
pref("general.buildID.override", "20100101");
pref("browser.startup.homepage_override.buildID", "20100101");
@@ -139,7 +139,7 @@ pref("xpinstall.whitelist.add", "");
pref("xpinstall.whitelist.add.36", "");
// Toolbar layout
-pref("browser.uiCustomization.state",
"{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"privatebrowsing-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"fullscreen-button\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\",\"downloads-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"noscript-tbb\",\"torbutton-button\",\"urlbar-container\",\"search-container\",\"webrtc-status-button\",\"social-share-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\"],\"newElementCount\":0}");
+pref("browser.uiCustomization.state",
"{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\",\"downloads-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"noscript-tbb\",\"torbutton-button\",\"urlbar-container\",\"search-container\",\"webrtc-status-button\",\"social-share-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\",\"addon-bar\"],\"newElementCount\":0}");
// Omnibox settings
pref("keyword.URL", "https://startpage.com/do/search?q=";);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-browser/tor-browser-31.1.1esr-4.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
commit 02c2539e40cc173e10aa9be0bb707ba93cf0a69c
Author: Mike Perry
Date: Wed Oct 1 15:17:51 2014 -0700
fixup! TB4: Tor Browser's Firefox preference overrides.
Bug #13318: Reduce extra buttons on the toolbar.
---
browser/app/profile/000-tor-browser.js |3 +++
1 file changed, 3 insertions(+)
diff --git a/browser/app/profile/000-tor-browser.js
b/browser/app/profile/000-tor-browser.js
index c885dae..2d21fe8 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -138,6 +138,9 @@ pref("extensions.pendingOperations", false);
pref("xpinstall.whitelist.add", "");
pref("xpinstall.whitelist.add.36", "");
+// Toolbar layout
+pref("browser.uiCustomization.state",
"{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"privatebrowsing-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"fullscreen-button\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\",\"downloads-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"noscript-tbb\",\"torbutton-button\",\"urlbar-container\",\"search-container\",\"webrtc-status-button\",\"social-share-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\"],\"newElementCount\":0}");
+
// Omnibox settings
pref("keyword.URL", "https://startpage.com/do/search?q=";);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torsocks/master] Add accept as an accepted value through syscall()
commit 3a8d1f2f2002a8d71a0d933aab697d03b3845ab3
Author: David Goulet
Date: Sun Sep 28 13:13:55 2014 -0400
Add accept as an accepted value through syscall()
This commit adds the accept(2) value to syscall(2) so we can pass it on
to Tor and not deny it blindly.
Signed-off-by: David Goulet
---
src/common/compat.h |5 +
src/lib/syscall.c | 19 +++
src/lib/torsocks.h |1 +
3 files changed, 25 insertions(+)
diff --git a/src/common/compat.h b/src/common/compat.h
index bda18f0..f572563 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -72,12 +72,16 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m);
#ifndef __NR_munmap
#define __NR_munmap -5
#endif
+#ifndef __NR_accept
+#define __NR_accept -6
+#endif
#define TSOCKS_NR_SOCKET__NR_socket
#define TSOCKS_NR_CONNECT __NR_connect
#define TSOCKS_NR_CLOSE __NR_close
#define TSOCKS_NR_MMAP __NR_mmap
#define TSOCKS_NR_MUNMAP__NR_munmap
+#define TSOCKS_NR_ACCEPT__NR_accept
#endif /* __linux__ */
@@ -95,6 +99,7 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m);
#define TSOCKS_NR_CLOSE SYS_close
#define TSOCKS_NR_MMAP SYS_mmap
#define TSOCKS_NR_MUNMAPSYS_munmap
+#define TSOCKS_NR_ACCEPTSYS_accept
#endif /* __FreeBSD__, __FreeBSD_kernel__, __darwin__, __NetBSD__ */
diff --git a/src/lib/syscall.c b/src/lib/syscall.c
index 9226f86..9de6744 100644
--- a/src/lib/syscall.c
+++ b/src/lib/syscall.c
@@ -68,6 +68,22 @@ static LIBC_CONNECT_RET_TYPE handle_connect(va_list args)
return tsocks_connect(sockfd, addr, addrlen);
}
+/*
+ * Handle accept(2) syscall to go through Tor.
+ */
+static LIBC_ACCEPT_RET_TYPE handle_accept(va_list args)
+{
+ int sockfd;
+ struct sockaddr *addr;
+ socklen_t addrlen;
+
+ sockfd = va_arg(args, __typeof__(sockfd));
+ addr = va_arg(args, __typeof__(addr));
+ addrlen = va_arg(args, __typeof__(addrlen));
+
+ return tsocks_accept(sockfd, addr, &addrlen);
+}
+
#if (defined(__linux__) || defined(__darwin__) || (defined(__FreeBSD_kernel__)
&& defined(__i386__)))
/*
* Handle mmap(2) syscall.
@@ -156,6 +172,9 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int number,
va_list args)
case TSOCKS_NR_MUNMAP:
ret = handle_munmap(args);
break;
+ case TSOCKS_NR_ACCEPT:
+ ret = handle_accept(args);
+ break;
default:
/*
* Deny call since we have no idea if this call can leak or not
data
diff --git a/src/lib/torsocks.h b/src/lib/torsocks.h
index 057a32e..9a99847 100644
--- a/src/lib/torsocks.h
+++ b/src/lib/torsocks.h
@@ -362,6 +362,7 @@ extern TSOCKS_LIBC_DECL(getpeername,
LIBC_GETPEERNAME_RET_TYPE,
/* accept(2) */
extern TSOCKS_LIBC_DECL(accept, LIBC_ACCEPT_RET_TYPE, LIBC_ACCEPT_SIG)
+TSOCKS_DECL(accept, LIBC_ACCEPT_RET_TYPE, LIBC_ACCEPT_SIG)
#define LIBC_ACCEPT_DECL LIBC_ACCEPT_RET_TYPE \
LIBC_ACCEPT_NAME(LIBC_ACCEPT_SIG)
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torsocks/master] Test: add missing connection destroy
commit b7854e0104286c372abfd0cb55db8ffeb035bbe8 Author: David Goulet Date: Wed Oct 1 16:35:23 2014 -0400 Test: add missing connection destroy Signed-off-by: David Goulet --- tests/unit/test_socks5.c |1 + 1 file changed, 1 insertion(+) diff --git a/tests/unit/test_socks5.c b/tests/unit/test_socks5.c index b3ed081..4ef92f7 100644 --- a/tests/unit/test_socks5.c +++ b/tests/unit/test_socks5.c @@ -668,6 +668,7 @@ static void test_socks5_send_connect_request(void) ok(ret == -EINVAL, "socks5 send connect request returns error for " "unkown connection domain"); + connection_destroy(conn_stub); } static void test_socks5_send_connect_request_failure(void) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torsocks/master] Test: fix memory leak in DNS test
commit 8cb73844e7ab74302fdcb289e679beab3de34ce0
Author: David Goulet
Date: Wed Oct 1 16:19:40 2014 -0400
Test: fix memory leak in DNS test
Fix Coverity issue 1243012.
Signed-off-by: David Goulet
---
tests/test_dns.c |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/test_dns.c b/tests/test_dns.c
index 58c7675..7d592ac 100644
--- a/tests/test_dns.c
+++ b/tests/test_dns.c
@@ -18,6 +18,7 @@
#include
#include
#include
+#include
#include
#include
@@ -100,7 +101,7 @@ static void test_getaddrinfo(const struct test_host *host)
{
int ret;
struct addrinfo hints;
-struct addrinfo *result;
+struct addrinfo *result = NULL;
diag("getaddrinfo test");
@@ -128,6 +129,7 @@ static void test_getaddrinfo(const struct test_host *host)
fail("Resolving address %s with getaddrinfo", host->name);
}
+ free(result);
return;
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torsocks/master] Test: possible double free in onion test
commit f5d5fba52c9d0bc2f08b78415633e11e06a94e1c
Author: David Goulet
Date: Wed Oct 1 16:24:33 2014 -0400
Test: possible double free in onion test
Fix Coverity issue 1195191.
Signed-off-by: David Goulet
---
tests/unit/test_onion.c |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/unit/test_onion.c b/tests/unit/test_onion.c
index c29d5e9..98bcd63 100644
--- a/tests/unit/test_onion.c
+++ b/tests/unit/test_onion.c
@@ -114,6 +114,7 @@ static void test_onion_init(struct onion_pool *pool)
pool->count == 0 &&
pool->next_entry_pos == 0,
"Valid onion pool of %s/%d", DEFAULT_ONION_ADDR_RANGE, mask);
+ onion_pool_destroy(pool);
/* Valid test. */
base = inet_addr("127.42.42.64");
@@ -127,6 +128,7 @@ static void test_onion_init(struct onion_pool *pool)
pool->count == 0 &&
pool->next_entry_pos == 0,
"Valid onion pool of 127.42.42.64/27");
+ onion_pool_destroy(pool);
/* Valid test. */
base = inet_addr("127.42.42.64");
@@ -140,6 +142,7 @@ static void test_onion_init(struct onion_pool *pool)
pool->count == 0 &&
pool->next_entry_pos == 0,
"Valid onion pool of 127.42.42.64/17");
+ onion_pool_destroy(pool);
/* Valid test with size less than default. */
base = inet_addr("127.42.42.0");
@@ -153,6 +156,7 @@ static void test_onion_init(struct onion_pool *pool)
pool->count == 0 &&
pool->next_entry_pos == 0,
"Valid onion pool of 127.42.42.0/32");
+ onion_pool_destroy(pool);
/* Invalid test. */
base = inet_addr("127.42.42.64");
@@ -160,8 +164,6 @@ static void test_onion_init(struct onion_pool *pool)
ret = onion_pool_init(pool, base, mask);
ok(ret == -EINVAL,
"Invalid onion pool of mask 42");
-
- onion_pool_destroy(pool);
}
int main(int argc, char **argv)
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [obfs4/master] Do the release ritual for obfs4proxy-0.0.3.
commit fc00015ee266eed17703be114543eecdde7bc818 Author: Yawning Angel Date: Wed Oct 1 19:29:22 2014 + Do the release ritual for obfs4proxy-0.0.3. --- ChangeLog|2 +- obfs4proxy/obfs4proxy.go |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8fc2275..19b5f7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.0.3 - UNRELEASED +Changes in version 0.0.3 - 2014-10-01 - Change the obfs4 bridge line format to use a "cert" argument instead of the previous "node-id" and "public-key" arguments. The "cert" consists of the Base64 encoded concatenation of the node ID and public key, with the diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go index 20ad89a..5c93053 100644 --- a/obfs4proxy/obfs4proxy.go +++ b/obfs4proxy/obfs4proxy.go @@ -51,7 +51,7 @@ import ( ) const ( - obfs4proxyVersion = "0.0.2" + obfs4proxyVersion = "0.0.3" obfs4proxyLogFile = "obfs4proxy.log" socksAddr = "127.0.0.1:0" elidedAddr= "[scrubbed]" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [obfs4/master] Change the bridge line format to be more compact.
commit 6cd81ec42f203585c59e610dc16728cb0a5d1455
Author: Yawning Angel
Date: Wed Oct 1 19:00:30 2014 +
Change the bridge line format to be more compact.
Instead of "node-id" and "public-key" that are Base16 encoded, use
"cert" which contains the "node-id" and "public-key" in Base64 encoded
form. This is more compact and cuts the length down by 49 characters.
---
ChangeLog |7 ++
README.md |4 +--
transports/obfs4/obfs4.go | 51 -
transports/obfs4/statefile.go | 56 ++---
4 files changed, 94 insertions(+), 24 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5fa836d..8fc2275 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Changes in version 0.0.3 - UNRELEASED
+ - Change the obfs4 bridge line format to use a "cert" argument instead of the
+ previous "node-id" and "public-key" arguments. The "cert" consists of the
+ Base64 encoded concatenation of the node ID and public key, with the
+ trailing padding removed. Old style separated bridge lines are still valid,
+ but the newer representation is slightly more compact.
+
Changes in version 0.0.2 - 2014-09-26
- Write an example client bridge line suitable for use with the running obfs4
server instance to "obfs4_bridgeline.txt" for the convenience of bridge
diff --git a/README.md b/README.md
index fdcb34b..40d092d 100644
--- a/README.md
+++ b/README.md
@@ -82,8 +82,8 @@ ServerTransportPlugin obfs4 exec /usr/local/bin/obfs4proxy
appropriate.
* The autogenerated obfs4 bridge parameters are placed in
- `DataDir/pt_state/obfs4_state.json`. An obfs4 bridge line requires the
- `node-id`, `public-key` and `iat-mode` arguments.
+ `DataDir/pt_state/obfs4_state.json`. To ease deployment, the client side
+ bridge line is written to `DataDir/pt_state/obfs4_bridgeline.txt`.
### Thanks
diff --git a/transports/obfs4/obfs4.go b/transports/obfs4/obfs4.go
index b862e5a..256f549 100644
--- a/transports/obfs4/obfs4.go
+++ b/transports/obfs4/obfs4.go
@@ -57,6 +57,7 @@ const (
privateKeyArg = "private-key"
seedArg = "drbg-seed"
iatArg= "iat-mode"
+ certArg = "cert"
biasCmdArg = "obfs4-distBias"
@@ -122,8 +123,7 @@ func (t *Transport) ServerFactory(stateDir string, args
*pt.Args) (base.ServerFa
// Store the arguments that should appear in our descriptor for the
clients.
ptArgs := pt.Args{}
- ptArgs.Add(nodeIDArg, st.nodeID.Hex())
- ptArgs.Add(publicKeyArg, st.identityKey.Public().Hex())
+ ptArgs.Add(certArg, st.cert.String())
ptArgs.Add(iatArg, strconv.Itoa(st.iatMode))
// Initialize the replay filter.
@@ -154,15 +154,39 @@ func (cf *obfs4ClientFactory) Transport() base.Transport {
func (cf *obfs4ClientFactory) ParseArgs(args *pt.Args) (interface{}, error) {
var err error
- // Handle the arguments.
- nodeIDStr, ok := args.Get(nodeIDArg)
- if !ok {
- return nil, fmt.Errorf("missing argument '%s'", nodeIDArg)
- }
var nodeID *ntor.NodeID
- if nodeID, err = ntor.NodeIDFromHex(nodeIDStr); err != nil {
- return nil, err
+ var publicKey *ntor.PublicKey
+
+ // The "new" (version >= 0.0.3) bridge lines use a unified "cert"
argument
+ // for the Node ID and Public Key.
+ certStr, ok := args.Get(certArg)
+ if ok {
+ var cert *obfs4ServerCert
+ if cert, err = serverCertFromString(certStr); err != nil {
+ return nil, err
+ }
+ nodeID, publicKey = cert.unpack()
+ } else {
+ // The "old" style (version <= 0.0.2) bridge lines use separate
Node ID
+ // and Public Key arguments in Base16 encoding and are a UX
disaster.
+ nodeIDStr, ok := args.Get(nodeIDArg)
+ if !ok {
+ return nil, fmt.Errorf("missing argument '%s'",
nodeIDArg)
+ }
+ if nodeID, err = ntor.NodeIDFromHex(nodeIDStr); err != nil {
+ return nil, err
+ }
+
+ publicKeyStr, ok := args.Get(publicKeyArg)
+ if !ok {
+ return nil, fmt.Errorf("missing argument '%s'",
publicKeyArg)
+ }
+ if publicKey, err = ntor.PublicKeyFromHex(publicKeyStr); err !=
nil {
+ return nil, err
+ }
}
+
+ // IAT config is common across the two bridge line formats.
iatStr, ok := args.Get(iatArg)
if !ok {
return nil, fmt.Errorf("missing argument '%s'", iatArg)
@@ -173,15 +197,6 @@ func (cf *obfs4ClientFactory) ParseArgs(args *pt.Args)
(interface{}, error) {
return nil, fmt.Errorf("invalid iat-mode '%d'", iatMode)
}
- publicKe
[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
commit 70d31ee1ee4d8f253605948b7696cdfc49f01fdc Author: Translation commit bot Date: Wed Oct 1 18:46:09 2014 + Update translations for torbutton-torbuttonproperties --- am/torbutton.properties |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/am/torbutton.properties b/am/torbutton.properties index f331727..b612cfb 100644 --- a/am/torbutton.properties +++ b/am/torbutton.properties @@ -3,9 +3,9 @@ torbutton.button.tooltip.enabled = áµá³á¥á á¦á torbutton.panel.tooltip.disabled = á½ááá ᶠá áá¥á á¦á torbutton.panel.tooltip.enabled = á½ááá ᶠáµá³á¥á á¦á torbutton.panel.plugins.disabled = á½ááá ᶠá áá¥á áááááµ -torbutton.panel.plugins.enabled = Click to disable plugins -torbutton.panel.label.disabled = Tor Disabled -torbutton.panel.label.enabled = Tor Enabled +torbutton.panel.plugins.enabled = á½ááá ᶠáµá³á¥á áááááµ +torbutton.panel.label.disabled = á¦á áµá³á¥ááµ +torbutton.panel.label.enabled = á¦á á áá¥ááµ extensions.torbut...@torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. torbutton.popup.history.warning = Torbutton blocked activity from a tab loaded in a different Tor state.\n\nThis is to work around Firefox Bugs 409737 and 417869.\n\nIf this popup seemed to happen for no reason, one of your tabs is attempting to reload itself in the background, and this was blocked.\n\nTo reload the tab in this Tor state, hit 'enter' in the URL location box.\n\n torbutton.popup.plugin.warning = Torbutton blocked direct Tor load of plugin content.\n\nUse Save-As instead.\n\n @@ -26,7 +26,7 @@ torbutton.popup.external.app = Tor Browser cannot display this file. You will ne torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n torbutton.popup.launch = Download file -torbutton.popup.cancel = Cancel +torbutton.popup.cancel = á»áá¸á torbutton.popup.dontask = Automatically download files from now on torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is unreachable. Is Polipo running properly? torbutton.popup.captcha.title = Avoid Google Captchas? ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tails-misc] Update translations for tails-misc
commit f9a6de6d2966317d76eb1d6199e8fd1e8b27aac7 Author: Translation commit bot Date: Wed Oct 1 18:45:52 2014 + Update translations for tails-misc --- am.po | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/am.po b/am.po index 896de6e..88a8f6c 100644 --- a/am.po +++ b/am.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-29 00:14+0200\n" -"PO-Revision-Date: 2014-05-29 08:50+\n" +"POT-Creation-Date: 2014-08-31 21:41+0200\n" +"PO-Revision-Date: 2014-10-01 18:21+\n" "Last-Translator: runasand \n" "Language-Team: Amharic (http://www.transifex.com/projects/p/torproject/language/am/)\n" "MIME-Version: 1.0\n" @@ -412,32 +412,32 @@ msgstr "" msgid "Failed to setup chroot." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:175 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:215 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:204 msgid "Shutting down the Unsafe Browser..." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:216 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:205 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:228 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:217 msgid "Failed to restart Tor." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:238 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager." ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
commit ae454a2d4e4cf27083441f8fe4f78e8b1c41d0bf Author: Translation commit bot Date: Wed Oct 1 18:16:11 2014 + Update translations for torbutton-torbuttonproperties --- am/torbutton.properties | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/am/torbutton.properties b/am/torbutton.properties index d23c67d..f331727 100644 --- a/am/torbutton.properties +++ b/am/torbutton.properties @@ -1,8 +1,8 @@ -torbutton.button.tooltip.disabled = Enable Tor -torbutton.button.tooltip.enabled = Disable Tor -torbutton.panel.tooltip.disabled = Click to enable Tor -torbutton.panel.tooltip.enabled = Click to disable Tor -torbutton.panel.plugins.disabled = Click to enable plugins +torbutton.button.tooltip.disabled = á áá¥á á¦á +torbutton.button.tooltip.enabled = áµá³á¥á á¦á +torbutton.panel.tooltip.disabled = á½ááá ᶠá áá¥á á¦á +torbutton.panel.tooltip.enabled = á½ááá ᶠáµá³á¥á á¦á +torbutton.panel.plugins.disabled = á½ááá ᶠá áá¥á áááááµ torbutton.panel.plugins.enabled = Click to disable plugins torbutton.panel.label.disabled = Tor Disabled torbutton.panel.label.enabled = Tor Enabled ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [ooni-probe/master] Add manpages for oonideckgen and ooniresources
commit 946c6e3c627ba55d32751b73f963f70d97f7cc09 Author: Arturo Filastò Date: Wed Oct 1 15:55:48 2014 +0200 Add manpages for oonideckgen and ooniresources --- MANIFEST.in |2 ++ data/oonideckgen.1 | 85 ++ data/ooniresources.1 | 78 + 3 files changed, 165 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index 2abe681..da56999 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,5 +5,7 @@ include data/GeoIP.dat include data/GeoIPASNum.dat include data/GeoLiteCity.dat include data/ooniprobe.conf.sample +include data/oonideckgen.1 include data/ooniprobe.1 include data/oonireport.1 +include data/ooniresources.1 diff --git a/data/oonideckgen.1 b/data/oonideckgen.1 new file mode 100644 index 000..9406d98 --- /dev/null +++ b/data/oonideckgen.1 @@ -0,0 +1,85 @@ +.\" Man page generated from reStructuredText. +. +.TH "oonideckgen" "1" "October 1, 2014" "1.1.4" "oonideckgen" +.SH NAME +oonideckgen - tool for generating ooniprobe test decks +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. + +.SH SYNOPSIS +.B oonideckgen +.RB [ --version ] +.RB [ --help ] +.RB [ \-c +.IR country-code] +.RB [ \-o +.IR output] + +.SH DESCRIPTION +.sp +oonideckgen will generate a ooniprobe test deck for the specified country. This +will then allow the user to conduct measurements useful to assess internet +censorship in that country. + + +.SH OPTIONS + +.TP +.BR \-\^h " or " \-\-help +Display this help and exit. +.TP +.BR \-\^c " or " \-\-country-code +Specify the country code for which a test deck should be geneated +.TP +.BR \-\^o " or " \-\-output +Specify in which directory the deck should be written. +.TP + + +.SH OONIDECKGEN +.sp +This tools will generate a test deck that include the following tests: + +* blocking/http_requests, with a set of relevant sites for the country to be analysed + +* blocking/dns_consistency, with all the DNS resolver of the country to be analysed and a set of relevant sites + +* manipulation/http_invalid_request_line + +* manipulation/http_header_field_manipulation + +If deckgen is run with no arugment a geoip lookup is done on the IP of the user +and that country is chosen. +In order to run deckgen you must have first have run ooniresource --update-inputs. +.sp + +.SH AUTHOR +The Tor Project +.SH COPYRIGHT +2014, The Tor Project +. diff --git a/data/ooniresources.1 b/data/ooniresources.1 new file mode 100644 index 000..5cd66cf --- /dev/null +++ b/data/ooniresources.1 @@ -0,0 +1,78 @@ +.\" Man page generated from reStructuredText. +. +.TH "ooniresources" "1" "October 1, 2014" "1.1.4" "ooniresources" +.SH NAME +ooniresources - tool for generating ooniprobe test decks +. +.nr rst2man-indent-level 0 +. +.de1 rstReportMargin +\\$1 \\n[an-margin] +level \\n[rst2man-indent-level] +level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] +- +\\n[rst2man-indent0] +\\n[rst2man-indent1] +\\n[rst2man-indent2] +.. +.de1 INDENT +.\" .rstReportMargin pre: +. RS \\$1 +. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin] +. nr rst2man-indent-level +1 +.\" .rstReportMargin post: +.. +.de UNINDENT +. RE +.\" indent \\n[an-margin] +.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]] +.nr rst2man-indent-level -1 +.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]] +.in \\n[rst2man-indent\\n[rst2man-indent-level]]u +.. + +.SH SYNOPSIS +.B ooniresources +.RB [ --version ] +.RB [ --help ] +.RB [ --update-inputs ] +.RB [ --update-geoip ] + +.SH DESCRIPTION +.sp +ooniresources will update the resources that are needed for the functioning of +ooniprobe and related tools. + +.SH OPTIONS + +.TP +.BR \-\^h " or " \-\-help +Display this help and exit. +.TP +.BR \-\-update\-inputs +This will update the inputs that are used for generating test decks with +oonideckgen. +.TP +.BR \-\-update\-geoip +This will update the maxmind geoip databases that are used for detecting the +probes country and ASN. +.TP + +.SH OONIRESOURCES +.sp +This tools will update the resources needed for running ooniprobe and +oonideckgen. +You don't need to run it very often, but it's just sufficient to run it once +every month of so as the data usually does not update or change that often. +If you are seeing some errors related to the geoip subsystem not having some +Maxmind databases, you probably want to run: +oonireso
[tor-commits] [ooni-probe/master] Update ooniprobe to 1.2.0
commit 520c78d1725b86f47de24d4ebf0e53d017ccfbbd Author: Arturo Filastò Date: Wed Oct 1 16:27:54 2014 +0200 Update ooniprobe to 1.2.0 --- ChangeLog.rst| 18 ++ debian/changelog |6 ++ ooni/__init__.py |2 +- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/ChangeLog.rst b/ChangeLog.rst index 101b63a..58b6e8e 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,6 +1,24 @@ Changelog = +v1.2.0 (Wed, 1 Oct 2014) +- + +* Introduce a new tool for generating ooniprobe test decks called oonideckgen. + +* Introduce a new tool for updating resources used for geoip lookup and deck + generation. + +* Add support for policy aware bouncing in the client. + https://trac.torproject.org/projects/tor/ticket/12579 + +* Various improvements to the bridge_reachability test (enable better tor + logging and also log obfsproxy) + +* Fix backward compatibility with twisted 13.1 and add regression tests for + this. + https://trac.torproject.org/projects/tor/ticket/13139 + v1.1.1 (Sun, 24 Aug 2014) - diff --git a/debian/changelog b/debian/changelog index 792faca..5340a13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ooniprobe (1.2.0-1) stable; urgency=low + + * ooniprobe 1.2.0 + + -- OONI Developers (signing key) Wed, 1 Oct 2014 16:07:00 +0200 + ooniprobe (1.1.1-1) stable; urgency=low * ooniprobe 1.1.1 diff --git a/ooni/__init__.py b/ooni/__init__.py index 89fa0bf..c873f37 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Open Observatory of Network Interference" -__version__ = "1.1.1" +__version__ = "1.2.0" __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'report', 'reporter', ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [oonib/master] Fix bug that lead test helpers to not be started.
commit 7e95433b66cb96b5c524a76c04da7251ae5d3a68
Author: Arturo Filastò
Date: Wed Oct 1 12:21:28 2014 +0200
Fix bug that lead test helpers to not be started.
Various pep8 related fixes.
---
oonib/errors.py |3 ++-
oonib/oonibackend.py | 50 +-
2 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/oonib/errors.py b/oonib/errors.py
index e20d471..c5829d2 100644
--- a/oonib/errors.py
+++ b/oonib/errors.py
@@ -89,7 +89,8 @@ class CollectorNotFound(OONIBError):
class NoValidCollector(OONIBError):
-pass
+status_code = 400
+log_message = "no-valid-collector"
class TestHelpersKeyMissing(OONIBError):
diff --git a/oonib/oonibackend.py b/oonib/oonibackend.py
index 6074d4a..9c10dc8 100644
--- a/oonib/oonibackend.py
+++ b/oonib/oonibackend.py
@@ -38,6 +38,7 @@ if config.helpers['ssl'].port:
http_helpers.HTTPReturnJSONHeadersHelper(),
ssl_helpers.SSLContext(config))
multiService.addService(ssl_helper)
+ssl_helper.startService()
# Start the DNS Server related services
if config.helpers['dns'].tcp_port:
@@ -45,6 +46,7 @@ if config.helpers['dns'].tcp_port:
tcp_dns_helper = internet.TCPServer(int(config.helpers['dns'].tcp_port),
dns_helpers.DNSTestHelper())
multiService.addService(tcp_dns_helper)
+tcp_dns_helper.startService()
if config.helpers['dns'].udp_port:
print "Starting UDP DNS Helper on %s" % config.helpers['dns'].udp_port
@@ -52,22 +54,26 @@ if config.helpers['dns'].udp_port:
udp_dns_helper = internet.UDPServer(int(config.helpers['dns'].udp_port),
udp_dns_factory)
multiService.addService(udp_dns_helper)
+udp_dns_helper.startService()
if config.helpers['dns_discovery'].udp_port:
print ("Starting UDP DNS Discovery Helper on %s" %
config.helpers['dns_discovery'].udp_port)
-udp_dns_discovery =
internet.UDPServer(int(config.helpers['dns_discovery'].udp_port),
- dns.DNSDatagramProtocol(
-
dns_helpers.DNSResolverDiscovery()
- ))
+udp_dns_discovery = internet.UDPServer(
+int(config.helpers['dns_discovery'].udp_port),
+dns.DNSDatagramProtocol(dns_helpers.DNSResolverDiscovery())
+)
multiService.addService(udp_dns_discovery)
if config.helpers['dns_discovery'].tcp_port:
print ("Starting TCP DNS Discovery Helper on %s" %
config.helpers['dns_discovery'].tcp_port)
-tcp_dns_discovery =
internet.TCPServer(int(config.helpers['dns_discovery'].tcp_port),
- dns_helpers.DNSResolverDiscovery())
+tcp_dns_discovery = internet.TCPServer(
+int(config.helpers['dns_discovery'].tcp_port),
+dns_helpers.DNSResolverDiscovery()
+)
multiService.addService(tcp_dns_discovery)
+tcp_dns_discovery.startService()
# XXX this needs to be ported
@@ -77,6 +83,7 @@ if config.helpers['daphn3'].port:
daphn3_helper = internet.TCPServer(int(config.helpers['daphn3'].port),
tcp_helpers.Daphn3Server())
multiService.addService(daphn3_helper)
+daphn3_helper.startService()
if config.helpers['tcp-echo'].port:
@@ -84,13 +91,16 @@ if config.helpers['tcp-echo'].port:
tcp_echo_helper = internet.TCPServer(int(config.helpers['tcp-echo'].port),
tcp_helpers.TCPEchoHelper())
multiService.addService(tcp_echo_helper)
+tcp_echo_helper.startService()
if config.helpers['http-return-json-headers'].port:
-print "Starting HTTP return request helper on %s" %
config.helpers['http-return-json-headers'].port
+print ("Starting HTTP return request helper on %s" %
+ config.helpers['http-return-json-headers'].port)
http_return_request_helper = internet.TCPServer(
int(config.helpers['http-return-json-headers'].port),
http_helpers.HTTPReturnJSONHeadersHelper())
multiService.addService(http_return_request_helper)
+http_return_request_helper.startService()
# add the tor collector service here
@@ -101,20 +111,24 @@ if config.main.tor_hidden_service:
def getHSEndpoint(data_dir):
if LooseVersion(txtorcon_version) >= LooseVersion('0.10.0'):
return TCPHiddenServiceEndpoint(reactor,
-torconfig, 80, hidden_service_dir=data_dir)
+torconfig,
+80,
+hidden_service_dir=data_dir)
else:
return TCPHiddenServiceEndpoint(reactor,
-torconfig, 80, data_dir=data_dir)
+torconfig,
+
[tor-commits] [oonib/master] Fix typo in changelog entry date.
commit 5366a07d2892f7a0f63cdcc4ba45f2bb1945ac97 Author: Arturo Filastò Date: Tue Sep 30 12:06:55 2014 +0200 Fix typo in changelog entry date. --- ChangeLog.rst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.rst b/ChangeLog.rst index c7c318a..9d01327 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,6 +1,6 @@ ChangeLog = -1.1.3 (Wed, 3 Sep 2014) +1.1.3 (Mon, 29 Sep 2014) --- * Add support for specifying the report archive path from config file ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [support-tools/master] Add response time data for September 2014
commit 30522fa24cd80e5c8c54b9d70b9ee74f1a2ce5c8 Author: Lunar Date: Wed Oct 1 10:30:19 2014 +0200 Add response time data for September 2014 --- response-time/data/2014Q3.csv | 234 + 1 file changed, 234 insertions(+) diff --git a/response-time/data/2014Q3.csv b/response-time/data/2014Q3.csv index fd4b41c..7cc7750 100644 --- a/response-time/data/2014Q3.csv +++ b/response-time/data/2014Q3.csv @@ -364,3 +364,237 @@ month,fromhours,tohours,requests 2014-08,1398,1399,1 2014-08,2312,2313,1 2014-08,2975,2976,1 +2014-09,0,1,446 +2014-09,1,2,228 +2014-09,2,3,148 +2014-09,3,4,135 +2014-09,4,5,91 +2014-09,5,6,116 +2014-09,6,7,66 +2014-09,7,8,55 +2014-09,8,9,67 +2014-09,9,10,53 +2014-09,10,11,46 +2014-09,11,12,50 +2014-09,12,13,42 +2014-09,13,14,49 +2014-09,14,15,34 +2014-09,15,16,29 +2014-09,16,17,21 +2014-09,17,18,36 +2014-09,18,19,37 +2014-09,19,20,32 +2014-09,20,21,18 +2014-09,21,22,25 +2014-09,22,23,26 +2014-09,23,24,21 +2014-09,24,25,19 +2014-09,25,26,14 +2014-09,26,27,28 +2014-09,27,28,26 +2014-09,28,29,21 +2014-09,29,30,22 +2014-09,30,31,11 +2014-09,31,32,24 +2014-09,32,33,13 +2014-09,33,34,18 +2014-09,34,35,23 +2014-09,35,36,14 +2014-09,36,37,16 +2014-09,37,38,12 +2014-09,38,39,12 +2014-09,39,40,6 +2014-09,40,41,13 +2014-09,41,42,12 +2014-09,42,43,4 +2014-09,43,44,8 +2014-09,44,45,7 +2014-09,45,46,9 +2014-09,46,47,7 +2014-09,47,48,4 +2014-09,48,49,4 +2014-09,49,50,6 +2014-09,50,51,11 +2014-09,51,52,6 +2014-09,52,53,4 +2014-09,53,54,9 +2014-09,54,55,3 +2014-09,55,56,7 +2014-09,56,57,2 +2014-09,57,58,4 +2014-09,58,59,6 +2014-09,59,60,5 +2014-09,60,61,3 +2014-09,61,62,6 +2014-09,62,63,3 +2014-09,63,64,7 +2014-09,64,65,5 +2014-09,65,66,2 +2014-09,66,67,2 +2014-09,67,68,3 +2014-09,68,69,6 +2014-09,69,70,4 +2014-09,70,71,8 +2014-09,71,72,2 +2014-09,72,73,5 +2014-09,73,74,3 +2014-09,74,75,2 +2014-09,75,76,2 +2014-09,76,77,5 +2014-09,77,78,3 +2014-09,78,79,4 +2014-09,79,80,4 +2014-09,80,81,4 +2014-09,82,83,2 +2014-09,83,84,2 +2014-09,85,86,1 +2014-09,87,88,5 +2014-09,88,89,3 +2014-09,89,90,1 +2014-09,90,91,2 +2014-09,91,92,3 +2014-09,92,93,4 +2014-09,93,94,2 +2014-09,94,95,2 +2014-09,95,96,4 +2014-09,96,97,5 +2014-09,97,98,1 +2014-09,98,99,5 +2014-09,99,100,1 +2014-09,100,101,1 +2014-09,101,102,2 +2014-09,102,103,2 +2014-09,103,104,3 +2014-09,106,107,1 +2014-09,107,108,4 +2014-09,110,111,1 +2014-09,111,112,2 +2014-09,112,113,1 +2014-09,113,114,1 +2014-09,114,115,4 +2014-09,115,116,5 +2014-09,116,117,1 +2014-09,118,119,5 +2014-09,119,120,2 +2014-09,120,121,2 +2014-09,121,122,2 +2014-09,122,123,2 +2014-09,123,124,2 +2014-09,124,125,2 +2014-09,125,126,1 +2014-09,127,128,1 +2014-09,128,129,1 +2014-09,130,131,2 +2014-09,133,134,3 +2014-09,135,136,4 +2014-09,136,137,3 +2014-09,137,138,3 +2014-09,138,139,2 +2014-09,139,140,1 +2014-09,140,141,3 +2014-09,142,143,1 +2014-09,143,144,3 +2014-09,145,146,1 +2014-09,147,148,3 +2014-09,148,149,1 +2014-09,149,150,2 +2014-09,150,151,1 +2014-09,154,155,1 +2014-09,155,156,1 +2014-09,160,161,1 +2014-09,162,163,1 +2014-09,163,164,2 +2014-09,166,167,1 +2014-09,167,168,1 +2014-09,170,171,2 +2014-09,171,172,1 +2014-09,172,173,1 +2014-09,174,175,1 +2014-09,175,176,1 +2014-09,177,178,1 +2014-09,180,181,1 +2014-09,183,184,3 +2014-09,184,185,1 +2014-09,187,188,1 +2014-09,189,190,1 +2014-09,197,198,1 +2014-09,200,201,1 +2014-09,202,203,1 +2014-09,206,207,1 +2014-09,209,210,2 +2014-09,210,211,2 +2014-09,211,212,1 +2014-09,214,215,1 +2014-09,225,226,1 +2014-09,234,235,2 +2014-09,235,236,1 +2014-09,237,238,1 +2014-09,242,243,1 +2014-09,243,244,1 +2014-09,247,248,1 +2014-09,255,256,1 +2014-09,257,258,1 +2014-09,258,259,1 +2014-09,266,267,1 +2014-09,274,275,1 +2014-09,275,276,1 +2014-09,276,277,1 +2014-09,279,280,1 +2014-09,297,298,1 +2014-09,300,301,1 +2014-09,311,312,2 +2014-09,314,315,1 +2014-09,321,322,2 +2014-09,322,323,1 +2014-09,327,328,1 +2014-09,352,353,1 +2014-09,353,354,1 +2014-09,377,378,1 +2014-09,391,392,1 +2014-09,436,437,1 +2014-09,478,479,1 +2014-09,550,551,1 +2014-09,768,769,1 +2014-09,858,859,1 +2014-09,1129,1130,1 +2014-09,1132,1133,1 +2014-09,2055,2056,1 +2014-09,2403,2404,1 +2014-09,2537,2538,1 +2014-09,4921,4922,1 +2014-09,5057,5058,1 +2014-09,5374,5375,1 +2014-09,5393,5394,1 +2014-09,5534,5535,1 +2014-09,5712,5713,1 +2014-09,5814,5815,1 +2014-09,6000,6001,1 +2014-09,6050,6051,1 +2014-09,6118,6119,1 +2014-09,6216,6217,1 +2014-09,6274,6275,1 +2014-09,6280,6281,1 +2014-09,6397,6398,1 +2014-09,6463,6464,1 +2014-09,6467,6468,1 +2014-09,6469,6470,1 +2014-09,7018,7019,1 +2014-09,7196,7197,1 +2014-09,7575,7576,1 +2014-09,8684,8685,1 +2014-09,9882,9883,1 +2014-09,9883,9884,1 +2014-09,10154,10155,1 +2014-09,10624,10625,1 +2014-09,10841,10842,1 +2014-09,11277,11278,1 +2014-09,11289,11290,1 +2014-09,11580,11581,1 +2014-09,11600,11601,1 +2014-09,11658,11659,1 +2014-09,11699,11700,1 +2014-09,11775,11776,1 +2014-09,11860,11861,1 +2014-09,12280,12281,1 +2014-09,12328,12329,1 +2014-09,12412,12413,1 __
[tor-commits] [support-tools/master] Add queue graphs data for September 2014
commit 25e96a02b533355fc41cfc0478cf4b6213b56502 Author: Lunar Date: Wed Oct 1 10:29:18 2014 +0200 Add queue graphs data for September 2014 --- queue-graphs/data/2014Q3.csv |6 ++ 1 file changed, 6 insertions(+) diff --git a/queue-graphs/data/2014Q3.csv b/queue-graphs/data/2014Q3.csv index 4208896..2d491bc 100644 --- a/queue-graphs/data/2014Q3.csv +++ b/queue-graphs/data/2014Q3.csv @@ -11,3 +11,9 @@ month,queue,newtickets 2014-08,fa,241 2014-08,fr,33 2014-08,zh,76 +2014-09,ar,6 +2014-09,en,1210 +2014-09,es,60 +2014-09,fa,127 +2014-09,fr,36 +2014-09,zh,94 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
