[tor-commits] [orbot/master] fixing flag typo
commit 84c6645220dfc570c332967e419e9e4abdff82b9 Author: Nathan Freitas nat...@freitas.net Date: Wed Apr 15 10:15:38 2015 -0400 fixing flag typo --- external/Makefile |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Makefile b/external/Makefile index c7f5269..b9cd735 100644 --- a/external/Makefile +++ b/external/Makefile @@ -52,7 +52,7 @@ STRIP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip \ --strip-unneeded -R .note -R .comment --strip-debug # PIEFLAGS for SDK 16/Android L must be set to -fPIE -pie, but can override for earlier targets -PIEFLAGS =? -fPIE -pie +PIEFLAGS ?= -fPIE -pie CFLAGS = -DANDROID $(TARGET_CFLAGS) $(PIEFLAGS) LDFLAGS = -llog $(TARGET_LDFLAGS) $(PIEFLAGS) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Make --hash-password imply --hush to prevent unnecessary noise.
commit 59e753a4a6751a38c9caa0731c883cd1d8ac07c2
Author: cypherpunks cypherpu...@torproject.org
Date: Fri Apr 10 16:10:44 2015 +0200
Make --hash-password imply --hush to prevent unnecessary noise.
---
changes/ticket15542 |3 +++
src/or/main.c |3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/ticket15542 b/changes/ticket15542
new file mode 100644
index 000..fcf293e
--- /dev/null
+++ b/changes/ticket15542
@@ -0,0 +1,3 @@
+ o Minor features (command-line interface):
+- Make --hash-password imply --hush to prevent unnecessary noise. Closes
+ ticket 15542.
diff --git a/src/or/main.c b/src/or/main.c
index a3da148..07d5ba8 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2484,10 +2484,11 @@ tor_init(int argc, char *argv[])
if (!strcmp(cl-key, --quiet) ||
!strcmp(cl-key, --dump-config))
quiet = 2;
- /* --version, --digests, and --help imply --hush */
+ /* The following options imply --hush */
if (!strcmp(cl-key, --version) || !strcmp(cl-key, --digests) ||
!strcmp(cl-key, --list-torrc-options) ||
!strcmp(cl-key, --library-versions) ||
+ !strcmp(cl-key, --hash-password) ||
!strcmp(cl-key, -h) || !strcmp(cl-key, --help)) {
if (quiet 1)
quiet = 1;
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] chagnes file for 15542
commit 7e6437babcea32c98cb028796bff1f81675b2c3b Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 15 09:40:27 2015 -0400 chagnes file for 15542 --- changes/15542 |3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/15542 b/changes/15542 new file mode 100644 index 000..bf289c9 --- /dev/null +++ b/changes/15542 @@ -0,0 +1,3 @@ + o Minor features: +- The --hash-password option now implies --hush to avoid needless + noise. Closes ticket 15542. Patch from cypherpunks. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor_animation_completed] Update translations for tor_animation_completed
commit 46fc7ccb10ebef893d37c52e944284680efe248f Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 12:45:57 2015 + Update translations for tor_animation_completed --- ru.srt | 165 1 file changed, 165 insertions(+) diff --git a/ru.srt b/ru.srt new file mode 100644 index 000..f97e649 --- /dev/null +++ b/ru.srt @@ -0,0 +1,165 @@ +1 +00:00:00,660 -- 00:00:02,780 +ÐÑ Ð¾ÑÐµÐ½Ñ Ð¿ÑивÑкли к инÑеÑнеÑÑ. + +2 +00:00:03,120 -- 00:00:07,700 +ÐÑ Ð¿Ð¾ÑÑоÑнно делимÑÑ Ð¸Ð½ÑоÑмаÑией +о наÑей ÑаÑÑной жизни: + +3 +00:00:08,000 -- 00:00:09,960 +ÑÑо Ð¼Ñ ÐµÐ´Ð¸Ð¼, Ñ ÐºÐµÐ¼ вÑÑÑеÑаемÑÑ, + +4 +00:00:10,180 -- 00:00:12,480 +кÑда Ñ Ð¾Ð´Ð¸Ð¼ и ÑÑо Ð¼Ñ ÑиÑаем. + +5 +00:00:13,280 -- 00:00:14,640 +СейÑÐ°Ñ Ð¾Ð±ÑÑÑÐ½Ñ Ð¿Ð¾Ð´Ñобнее. + +6 +00:00:14,920 -- 00:00:17,740 +ÐÑÑмо ÑейÑаÑ, +еÑли кÑо-Ñо Ð·Ð°Ñ Ð¾ÑÐµÑ Ð²Ð°Ñ Ð½Ð°Ð¹Ñи, + +7 +00:00:18,060 -- 00:00:22,480 +они ÑвидÑÑ Ð²Ð°ÑÑ Ð¿Ð¾Ð´ÐµÐ½Ð½ÑÑ Ð¸Ð½ÑоÑмаÑиÑ, +ÑоÑное меÑÑÐ¾Ð½Ð°Ñ Ð¾Ð¶Ð´ÐµÐ½Ð¸Ðµ, опеÑаÑионнÑÑ ÑиÑÑемÑ, + +8 +00:00:22,800 -- 00:00:26,500 +вÑе ÑайÑÑ ÐºÐ¾ÑоÑÑе Ð²Ñ Ð¿Ð¾ÑеÑали, +Ð²Ð°Ñ Ð±ÑаÑзеÑ, + +9 +00:00:26,700 -- 00:00:29,140 +и еÑе болÑÑе инÑоÑмаÑии +о Ð²Ð°Ñ Ð¸ ваÑей жизни + +10 +00:00:29,620 -- 00:00:32,460 +коÑоÑой Ð²Ñ Ð²ÑÑд ли Ñ Ð¾Ñели +делиÑÑÑ Ñ Ð½ÐµÐ·Ð½Ð°ÐºÐ¾Ð¼Ñами, + +11 +00:00:32,920 -- 00:00:35,840 +коÑоÑÑе легко ÑмогÑÑ Ð¸ÑполÑзоваÑÑ ÑÑÑ Ð¸Ð½ÑоÑмаÑÐ¸Ñ +пÑоÑив ваÑ. + +12 +00:00:36,220 -- 00:00:38,120 +Ðо не ÑмогÑÑ ÐµÑли ÐÑ Ð¸ÑполÑзÑеÑе Tor! + +13 +00:00:39,140 -- 00:00:42,840 +ÐÑаÑÐ·ÐµÑ Tor Ð¾Ñ ÑанÑÐµÑ Ð½Ð°ÑÑ Ð¿ÑиваÑноÑÑÑ +и лиÑноÑÑÑ Ð² инÑеÑнеÑе. + +14 +00:00:43,560 -- 00:00:46,760 +Tor заÑиÑÐ°ÐµÑ Ð²Ð°Ñе Ñоединение + ÑÑÐµÐ¼Ñ ÑлоÑми ÑиÑÑÐ¾Ð²Ð°Ð½Ð¸Ñ + +15 +00:00:46,940 -- 00:00:51,760 +и пÑопÑÑÐºÐ°ÐµÑ ÐµÐ³Ð¾ ÑеÑез ÑÑи добÑоволÑно +ÑкÑплÑаÑиÑÑемÑе ÑеÑвеÑÑ Ð¿Ð¾ вÑÐµÐ¼Ñ Ð¼Ð¸ÑÑ, + +16 +00:00:52,280 -- 00:00:55,520 +коÑоÑÑе позволÑÑÑ Ð½Ð°Ð¼ обÑаÑÑÑÑ +анонимно ÑеÑез ÐнÑеÑнеÑ. + +17 +00:00:58,560 -- 00:01:00,280 +Tor Ñакже заÑиÑÐ°ÐµÑ Ð½Ð°Ñи даннÑе + +18 +00:01:00,400 -- 00:01:03,900 +Ð¾Ñ ÐºÐ¾ÑпоÑаÑивной или гоÑÑдаÑÑÑвенной Ñелевой +и маÑÑовой Ñлежки. + +19 +00:01:04,880 -- 00:01:09,340 +Ðозможно, Ð²Ñ Ð¶Ð¸Ð²ÐµÑе в ÑепÑеÑÑивной ÑÑÑане, +коÑоÑÐ°Ñ Ð¿ÑÑаеÑÑÑ ÐºÐ¾Ð½ÑÑолиÑоваÑÑ Ð¸ наблÑдаÑÑ Ð·Ð° ÐнÑеÑнеÑом. + +20 +00:01:09,900 -- 00:01:13,800 +Ðли, Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ, Ð²Ñ Ð½Ðµ Ñ Ð¾ÑиÑе, ÑÑÐ¾Ð±Ñ Ð±Ð¾Ð»ÑÑие коÑпоÑаÑии +воÑполÑзовалиÑÑ Ð²Ð°Ñей лиÑной инÑоÑмаÑии. + +21 +00:01:14,880 -- 00:01:17,640 +Tor Ð´ÐµÐ»Ð°ÐµÑ Ð²ÑÐµÑ ÑÐ²Ð¾Ð¸Ñ Ð¿Ð¾Ð»ÑзоваÑелей + неоÑлиÑимÑми + +22 +00:01:17,920 -- 00:01:20,800 +коÑоÑÑÑ ÑмÑÑÐ°ÐµÑ Ð½Ð°Ð±Ð»ÑдаÑелÑ, +и Ð´ÐµÐ»Ð°ÐµÑ Ð²Ð°Ñ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ñм. + +23 +00:01:21,500 -- 00:01:24,980 +ÐоÑÑомÑ, Ñем болÑÑе лÑдей иÑполÑзÑÑÑ ÑеÑÑ Tor, +Ñем ÑилÑнее она ÑÑановиÑÑÑ + +24 +00:01:25,140 -- 00:01:29,800 +Ñ.к. пÑоÑе ÑпÑÑÑаÑÑÑÑ Ð² Ñолпе +лÑдей, коÑоÑÑе вÑглÑдÑÑ Ð°Ð±ÑолÑÑно одинаково. + +25 +00:01:30,700 -- 00:01:33,240 +ÐÑ Ð¼Ð¾Ð¶ÐµÑе обойÑи ÑензÑÑÑ + не беÑпокоÑÑÑ Ð¾ Ñом, ÑÑо + +26 +00:01:33,400 -- 00:01:36,100 +ÑÐµÐ½Ð·Ð¾Ñ ÑзнаеÑ, ÑÑо Ð²Ñ Ð´ÐµÐ»Ð°ÐµÑе +в ÐнÑеÑнеÑе. + +27 +00:01:38,540 -- 00:01:41,440 +Реклама не бÑÐ´ÐµÑ Ð¿ÑеÑледоваÑÑ Ð²Ð°Ñ +везде и вÑÑÐ´Ñ + +28 +00:01:41,640 -- 00:01:43,300 +наÑÐ¸Ð½Ð°Ñ Ñ Ð¿ÐµÑвого +нажаÑÐ¸Ñ Ð½Ð° пÑодÑкÑ. + +29 +00:01:45,880 -- 00:01:49,380 +ÐлагодаÑÑ Ð¸ÑполÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Tor, ÑайÑÑ, коÑоÑÑе Ð²Ñ Ð¿Ð¾ÑеÑаеÑе +даже не бÑдÑÑ Ð·Ð½Ð°ÑÑ, кÑо Ð²Ñ Ñакой. + +30 +00:01:49,540 -- 00:01:51,760 +из какой ÑаÑÑи миÑа +Ð²Ñ Ð¿Ð¾ÑеÑаеÑе Ð¸Ñ . + +31 +00:01:51,920 -- 00:01:53,920 +кÑоме ÑлÑÑаÑ, когда Ð²Ñ ÑделаеÑе Ð²Ñ Ð¾Ð´ на ÑÐ°Ð¹Ñ Ð¸ ÑÑим ÑообÑиÑе о Ñебе. + +32 +00:01:56,200 -- 00:01:57,840 +СкаÑÐ¸Ð²Ð°Ñ Ð¸ иÑполÑзÑÑ Tor + +33 +00:01:58,200 -- 00:02:00,560 +Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе заÑиÑаÑÑ Ð»Ñдей, +коÑоÑÑм нÑжна анонимноÑÑÑ, + +34 +00:02:00,880 -- 00:02:03,640 +ÑÐ°ÐºÐ¸Ñ , как акÑивиÑÑÑ,
[tor-commits] [translation/tor_animation] Update translations for tor_animation
commit 80689eb192318009941b62e65f605d407991170b Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 12:45:53 2015 + Update translations for tor_animation --- ru.srt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ru.srt b/ru.srt index 98c1b55..f97e649 100644 --- a/ru.srt +++ b/ru.srt @@ -157,9 +157,9 @@ Tor Ð´ÐµÐ»Ð°ÐµÑ Ð²ÑÐµÑ ÑÐ²Ð¾Ð¸Ñ Ð¿Ð¾Ð»ÑзоваÑелей 34 00:02:00,880 -- 00:02:03,640 -Ñакие, как акÑивиÑÑÑ, жÑÑналиÑÑÑ Ð¸ блоггеÑÑ +ÑÐ°ÐºÐ¸Ñ , как акÑивиÑÑÑ, жÑÑналиÑÑÑ Ð¸ блоггеÑÑ 35 00:02:04,000 -- 00:02:09,000 -Download and use Tor! Or run a relay! +СкаÑивайÑе и иÑполÑзÑйÑе Tor! Ðли запÑÑÑиÑе Ñ ÑÐµÐ±Ñ ÑелейнÑй Ñзел Tor! ___ 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] Bug 15670: add support for the no_update_for option in config.yml
commit 7d7faa30b4443f0cc76474738a36fd3f45e875f4
Author: Nicolas Vigier bo...@torproject.org
Date: Mon Apr 13 19:53:11 2015 +0200
Bug 15670: add support for the no_update_for option in config.yml
---
tools/update-responses/update_responses |4
1 file changed, 4 insertions(+)
diff --git a/tools/update-responses/update_responses
b/tools/update-responses/update_responses
index 07efc7c..6c497ef 100755
--- a/tools/update-responses/update_responses
+++ b/tools/update-responses/update_responses
@@ -283,6 +283,10 @@ sub write_htaccess {
my $version = $config-{channels}{$channel};
my $files = $config-{versions}{$version}{files};
$htaccess .= RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n;
+my $noup_for = $config-{no_update_for}{$channel};
+for my $noup_ver (ref $noup_for eq 'ARRAY' ? @$noup_for : ()) {
+$htaccess .= RewriteRule ^[^\/]+/$noup_ver/ no-update.xml
$flags\n;
+}
foreach my $os (sort keys %$files) {
my $bt = build_target_by_os($os);
foreach my $lang (sort keys %{$files-{$os}}) {
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] fix PIE_FLAGS variable to allow for override
commit dbe3024dfc048cefd846426463e685a58a7eb56e Author: Nathan Freitas nat...@freitas.net Date: Wed Apr 15 09:58:02 2015 -0400 fix PIE_FLAGS variable to allow for override also, standardize use of STRIP command --- external/Makefile | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/external/Makefile b/external/Makefile index 5b13fb5..c7f5269 100644 --- a/external/Makefile +++ b/external/Makefile @@ -49,10 +49,10 @@ LD := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ld AR := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ar RANLIB := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ranlib STRIP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip \ - --strip-unneeded -R .note -R .comment + --strip-unneeded -R .note -R .comment --strip-debug -# PIEFLAGS for SDK 16/Android L must be set to -fPIE -pie -PIEFLAGS = -fPIE -pie +# PIEFLAGS for SDK 16/Android L must be set to -fPIE -pie, but can override for earlier targets +PIEFLAGS =? -fPIE -pie CFLAGS = -DANDROID $(TARGET_CFLAGS) $(PIEFLAGS) LDFLAGS = -llog $(TARGET_LDFLAGS) $(PIEFLAGS) @@ -258,11 +258,14 @@ assets: tor polipo jtorctl iptables install -d ../libs install bin/jtorctl.jar ../libs install -d ../assets/$(APP_ABI) - -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/polipo +## -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug + -$(STRIP) bin/polipo -zip ../assets/$(APP_ABI)/polipo.mp3 bin/polipo - -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/tor +## -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/tor + -$(STRIP) bin/tor -zip ../assets/$(APP_ABI)/tor.mp3 bin/tor - -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/xtables +## -$(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-debug bin/xtables + -$(STRIP) bin/xtables -zip ../assets/$(APP_ABI)/xtables.mp3 bin/xtables assets-clean: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] handle NPE on number format instance
commit 1bc427b50e91c30bdb0f75a2b31f9f8c7f9c6403
Author: Nathan Freitas nat...@freitas.net
Date: Mon Apr 13 10:25:58 2015 -0400
handle NPE on number format instance
---
src/org/torproject/android/service/TorService.java | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/org/torproject/android/service/TorService.java
b/src/org/torproject/android/service/TorService.java
index 1a48c46..50792b8 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -604,6 +604,7 @@ public class TorService extends Service implements
TorServiceConstants, OrbotCon
{
try
{
+mNumberFormat = NumberFormat.getInstance(Locale.getDefault());
//localized numbers!
if (mNotificationManager == null)
{
@@ -636,7 +637,6 @@ public class TorService extends Service implements
TorServiceConstants, OrbotCon
}
}).start();
-mNumberFormat = NumberFormat.getInstance(Locale.getDefault());
//localized numbers!
if (OrbotVpnService.mSocksProxyPort == -1)
OrbotVpnService.mSocksProxyPort =
(int)((Math.random()*1000)+1);
@@ -1619,10 +1619,13 @@ public class TorService extends Service implements
TorServiceConstants, OrbotCon
// Converts the supplied argument into a string.
// Under 2Mb, returns xxx.xKb
// Over 2Mb, returns xxx.xxMb
-if (count 1e6)
-return
mNumberFormat.format(Math.round((float)((int)(count*10/1024))/10)) + Kbps;
-else
- return
mNumberFormat.format(Math.round((float)((int)(count*100/1024/1024))/100)) +
Mbps;
+ if (mNumberFormat != null)
+ if (count 1e6)
+ return
mNumberFormat.format(Math.round((float)((int)(count*10/1024))/10)) + Kbps;
+ else
+ return
mNumberFormat.format(Math.round((float)((int)(count*100/1024/1024))/100)) +
Mbps;
+ else
+ return ;
//return count+ kB;
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [orbot/master] fix NPE crash if VPN prepare Intent is null on boot
commit ec2442891590366b2c8a625551a92e74e9947393
Author: Nathan Freitas nat...@freitas.net
Date: Mon Apr 13 10:24:03 2015 -0400
fix NPE crash if VPN prepare Intent is null on boot
---
src/org/torproject/android/service/OnBootReceiver.java | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/org/torproject/android/service/OnBootReceiver.java
b/src/org/torproject/android/service/OnBootReceiver.java
index f87d2bb..a97091e 100644
--- a/src/org/torproject/android/service/OnBootReceiver.java
+++ b/src/org/torproject/android/service/OnBootReceiver.java
@@ -33,15 +33,15 @@ public class OnBootReceiver extends BroadcastReceiver {
@SuppressLint(NewApi)
public void startVpnService (Context context)
-{
-Intent intent = VpnService.prepare(context);
-intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-if (intent != null) {
-context.startActivity(intent);
-}
+ {
+ Intent intent = VpnService.prepare(context);
+
+ if (intent != null) {
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ context.startActivity(intent);
+ }
-}
+ }
private void startService (String action, Context context)
{
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor_animation] Update translations for tor_animation
commit c0ab8d26621376df3995243b65d7edf0b5afd779 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 12:15:52 2015 + Update translations for tor_animation --- ru.srt | 71 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/ru.srt b/ru.srt index fbc1a64..98c1b55 100644 --- a/ru.srt +++ b/ru.srt @@ -65,98 +65,99 @@ Tor заÑиÑÐ°ÐµÑ Ð²Ð°Ñе Ñоединение 15 00:00:46,940 -- 00:00:51,760 -и пÑопÑÑÐºÐ°ÐµÑ ÐµÐ³Ð¾ ÑеÑез ÑÑи добÑоволÑно ÑкÑплÑаÑиÑÑемÑе ÑеÑвеÑÑ Ð¿Ð¾ вÑÐµÐ¼Ñ Ð¼Ð¸ÑÑ, +и пÑопÑÑÐºÐ°ÐµÑ ÐµÐ³Ð¾ ÑеÑез ÑÑи добÑоволÑно +ÑкÑплÑаÑиÑÑемÑе ÑеÑвеÑÑ Ð¿Ð¾ вÑÐµÐ¼Ñ Ð¼Ð¸ÑÑ, 16 00:00:52,280 -- 00:00:55,520 -which enables us to communicate -anonymously over the Internet. +коÑоÑÑе позволÑÑÑ Ð½Ð°Ð¼ обÑаÑÑÑÑ +анонимно ÑеÑез ÐнÑеÑнеÑ. 17 00:00:58,560 -- 00:01:00,280 -Tor also protects our data +Tor Ñакже заÑиÑÐ°ÐµÑ Ð½Ð°Ñи даннÑе 18 00:01:00,400 -- 00:01:03,900 -against corporate or government targeted -and mass surveillance. +Ð¾Ñ ÐºÐ¾ÑпоÑаÑивной или гоÑÑдаÑÑÑвенной Ñелевой +и маÑÑовой Ñлежки. 19 00:01:04,880 -- 00:01:09,340 -Perhaps you live in a repressive country -which tries to control and surveil the Internet. +Ðозможно, Ð²Ñ Ð¶Ð¸Ð²ÐµÑе в ÑепÑеÑÑивной ÑÑÑане, +коÑоÑÐ°Ñ Ð¿ÑÑаеÑÑÑ ÐºÐ¾Ð½ÑÑолиÑоваÑÑ Ð¸ наблÑдаÑÑ Ð·Ð° ÐнÑеÑнеÑом. 20 00:01:09,900 -- 00:01:13,800 -Or perhaps you don't want big corporations -taking advantage of your personal information. +Ðли, Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ, Ð²Ñ Ð½Ðµ Ñ Ð¾ÑиÑе, ÑÑÐ¾Ð±Ñ Ð±Ð¾Ð»ÑÑие коÑпоÑаÑии +воÑполÑзовалиÑÑ Ð²Ð°Ñей лиÑной инÑоÑмаÑии. 21 00:01:14,880 -- 00:01:17,640 -Tor makes all of its users -to look the same +Tor Ð´ÐµÐ»Ð°ÐµÑ Ð²ÑÐµÑ ÑÐ²Ð¾Ð¸Ñ Ð¿Ð¾Ð»ÑзоваÑелей + неоÑлиÑимÑми 22 00:01:17,920 -- 00:01:20,800 -which confuses the observer -and makes you anonymous. +коÑоÑÑÑ ÑмÑÑÐ°ÐµÑ Ð½Ð°Ð±Ð»ÑдаÑелÑ, +и Ð´ÐµÐ»Ð°ÐµÑ Ð²Ð°Ñ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ñм. 23 00:01:21,500 -- 00:01:24,980 -So, the more people use the Tor network, -the stronger it gets +ÐоÑÑомÑ, Ñем болÑÑе лÑдей иÑполÑзÑÑÑ ÑеÑÑ Tor, +Ñем ÑилÑнее она ÑÑановиÑÑÑ 24 00:01:25,140 -- 00:01:29,800 -as it's easier to hide in a crowd -of people who look exactly the same. +Ñ.к. пÑоÑе ÑпÑÑÑаÑÑÑÑ Ð² Ñолпе +лÑдей, коÑоÑÑе вÑглÑдÑÑ Ð°Ð±ÑолÑÑно одинаково. 25 00:01:30,700 -- 00:01:33,240 -You can bypass the censorship -without being worried about +ÐÑ Ð¼Ð¾Ð¶ÐµÑе обойÑи ÑензÑÑÑ + не беÑпокоÑÑÑ Ð¾ Ñом, ÑÑо 26 00:01:33,400 -- 00:01:36,100 -the censor knowing what you do -on the Internet. +ÑÐµÐ½Ð·Ð¾Ñ ÑзнаеÑ, ÑÑо Ð²Ñ Ð´ÐµÐ»Ð°ÐµÑе +в ÐнÑеÑнеÑе. 27 00:01:38,540 -- 00:01:41,440 -The ads won't follow you -everywhere for months, +Реклама не бÑÐ´ÐµÑ Ð¿ÑеÑледоваÑÑ Ð²Ð°Ñ +везде и вÑÑÐ´Ñ 28 00:01:41,640 -- 00:01:43,300 -starting when you first -clicked on a product. +наÑÐ¸Ð½Ð°Ñ Ñ Ð¿ÐµÑвого +нажаÑÐ¸Ñ Ð½Ð° пÑодÑкÑ. 29 00:01:45,880 -- 00:01:49,380 -By using Tor, the sites you visit -won't even know who you are, +ÐлагодаÑÑ Ð¸ÑполÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Tor, ÑайÑÑ, коÑоÑÑе Ð²Ñ Ð¿Ð¾ÑеÑаеÑе +даже не бÑдÑÑ Ð·Ð½Ð°ÑÑ, кÑо Ð²Ñ Ñакой. 30 00:01:49,540 -- 00:01:51,760 -from what part of the world -you're visiting them, +из какой ÑаÑÑи миÑа +Ð²Ñ Ð¿Ð¾ÑеÑаеÑе Ð¸Ñ . 31 00:01:51,920 -- 00:01:53,920 -unless you login and tell them so. +кÑоме ÑлÑÑаÑ, когда Ð²Ñ ÑделаеÑе Ð²Ñ Ð¾Ð´ на ÑÐ°Ð¹Ñ Ð¸ ÑÑим ÑообÑиÑе о Ñебе. 32 00:01:56,200 -- 00:01:57,840 -By downloading and using Tor, +СкаÑÐ¸Ð²Ð°Ñ Ð¸ иÑполÑзÑÑ Tor 33 00:01:58,200 -- 00:02:00,560 -you can protect the people -who need anonymity, +Ð²Ñ Ð¼Ð¾Ð¶ÐµÑе заÑиÑаÑÑ Ð»Ñдей, +коÑоÑÑм нÑжна анонимноÑÑÑ, 34 00:02:00,880 -- 00:02:03,640 -like activists, journalists and bloggers. +Ñакие, как акÑивиÑÑÑ, жÑÑналиÑÑÑ Ð¸ блоггеÑÑ 35 00:02:04,000 -- 00:02:09,000 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-launcher/master] Bug 15657: display host:port if HOSTADDR is provided by Tor.
commit b48d563eaa58b2c423b1eba09aa712787ba5a559
Author: Kathy Brade br...@pearlcrescent.com
Date: Fri Apr 10 18:00:23 2015 -0400
Bug 15657: display host:port if HOSTADDR is provided by Tor.
If a Tor bootstrap status message contains a HOSTADDR value, include
it within the error alert that we display.
Also fix a problem where the progress dialog stayed open after an error
occurred (even though an error alert was displayed as soon as the user
clicked the Cancel button).
---
src/chrome/content/progress.js | 13 ++---
src/components/tl-process.js |7 ---
src/components/tl-protocol.js |3 ++-
src/modules/tl-util.jsm|5 -
4 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js
index 30c4370..8208398 100644
--- a/src/chrome/content/progress.js
+++ b/src/chrome/content/progress.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Tor Project, Inc.
+// Copyright (c) 2015, The Tor Project, Inc.
// See LICENSE for licensing information.
//
// vim: set sw=2 sts=2 ts=8 et syntax=javascript:
@@ -9,6 +9,7 @@ const Cu = Components.utils;
const kTorProcessExitedTopic = TorProcessExited;
const kBootstrapStatusTopic = TorBootstrapStatus;
+const kTorBootstrapErrorTopic = TorBootstrapError;
const kTorLogHasWarnOrErrTopic = TorLogHasWarnOrErr;
Cu.import(resource://gre/modules/XPCOMUtils.jsm);
@@ -42,6 +43,7 @@ function initDialog()
.getService(Ci.nsIObserverService);
gObsSvc.addObserver(gObserver, kTorProcessExitedTopic, false);
gObsSvc.addObserver(gObserver, kBootstrapStatusTopic, false);
+gObsSvc.addObserver(gObserver, kTorBootstrapErrorTopic, false);
gObsSvc.addObserver(gObserver, kTorLogHasWarnOrErrTopic, false);
}
catch (e) {}
@@ -85,6 +87,7 @@ function cleanup()
{
gObsSvc.removeObserver(gObserver, kTorProcessExitedTopic);
gObsSvc.removeObserver(gObserver, kBootstrapStatusTopic);
+gObsSvc.removeObserver(gObserver, kTorBootstrapErrorTopic);
gObsSvc.removeObserver(gObserver, kTorLogHasWarnOrErrTopic);
}
}
@@ -132,10 +135,14 @@ var gObserver = {
// nsIObserver implementation.
observe: function(aSubject, aTopic, aParam)
{
-if (kTorProcessExitedTopic == aTopic)
+if ((kTorProcessExitedTopic == aTopic) ||
+(kTorBootstrapErrorTopic == aTopic))
{
+ // In these cases, an error alert will be displayed elsewhere so it is
+ // best to close this window.
// TODO: provide a way to access tor log e.g., leave this dialog open
- // and display the open settings button.
+ // and display the open settings button or provide a way to do
+ // that from our error alerts.
cleanup();
window.close();
}
diff --git a/src/components/tl-process.js b/src/components/tl-process.js
index b6dc98f..ef2b12c 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Tor Project, Inc.
+// Copyright (c) 2015, The Tor Project, Inc.
// See LICENSE for licensing information.
//
// vim: set sw=2 sts=2 ts=8 et syntax=javascript:
@@ -524,10 +524,11 @@ TorProcessService.prototype =
this.mLastTorWarningPhase = aStatusObj.TAG;
this.mLastTorWarningReason = aStatusObj.REASON;
+ // Notify others that an error will be displayed.
+ this.mObsSvc.notifyObservers(null, TorBootstrapError, reason);
+
var msg = TorLauncherUtil.getLocalizedString(tor_bootstrap_failed);
TorLauncherUtil.showAlert(null, msg + \n\n + details);
-
- this.mObsSvc.notifyObservers(null, TorBootstrapError, reason);
}
}
}
diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js
index 09ec468..559bb37 100644
--- a/src/components/tl-protocol.js
+++ b/src/components/tl-protocol.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Tor Project, Inc.
+// Copyright (c) 2015, The Tor Project, Inc.
// See LICENSE for licensing information.
// TODO: Some code came from torbutton.js (pull in copyright and license?)
//
@@ -310,6 +310,7 @@ TorProtocolService.prototype =
// status.REASON -- string (optional)
// status.COUNT -- integer (optional)
// status.RECOMMENDATION -- string (optional)
+ // status.HOSTADDR-- string (optional)
// A TorBootstrapStatus notification is also sent.
// Returns null upon failure.
_parseBootstrapStatus: function(aStatusMsg)
diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm
index 834d260..ac680a8 100644
--- a/src/modules/tl-util.jsm
+++ b/src/modules/tl-util.jsm
@@ -1,4 +1,4 @@
-// Copyright (c) 2014, The Tor Project, Inc.
+// Copyright (c) 2015, The Tor Project, Inc.
// See LICENSE for licensing information.
//
// vim: set sw=2 sts=2 ts=8 et syntax=javascript:
@@ -182,6 +182,9 @@ let TorLauncherUtil = // Public
if (!result)
[tor-commits] [tor/master] Refactor router_rebuild_descriptor
commit 8feaf3846d67d80d6a1bae9867cdf55bafdc437e
Author: Sebastian Hahn sebast...@torproject.org
Date: Sat Feb 7 13:29:26 2015 +0100
Refactor router_rebuild_descriptor
Allow building a router descriptor without storing it to global state.
This is in preparation of a patch to export the created descriptors via
the control port.
---
src/or/router.c | 59 +--
src/or/router.h |1 +
2 files changed, 45 insertions(+), 15 deletions(-)
diff --git a/src/or/router.c b/src/or/router.c
index 2ddaa89..b8bfd3c 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1802,12 +1802,15 @@ router_pick_published_address(const or_options_t
*options, uint32_t *addr)
return 0;
}
-/** If bforce/b is true, or our descriptor is out-of-date, rebuild a fresh
- * routerinfo, signed server descriptor, and extra-info document for this OR.
- * Return 0 on success, -1 on temporary error.
+/** Build a fresh routerinfo, signed server descriptor, and extra-info document
+ * for this OR. Set r to the generated routerinfo, e to the generated
+ * extra-info document. Return 0 on success, -1 on temporary error. Failure to
+ * generate an extra-info document is not an error and is indicated by setting
+ * e to NULL. Caller is responsible for freeing generated documents if 0 is
+ * returned.
*/
int
-router_rebuild_descriptor(int force)
+router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e)
{
routerinfo_t *ri;
extrainfo_t *ei;
@@ -1816,20 +1819,11 @@ router_rebuild_descriptor(int force)
int hibernating = we_are_hibernating();
const or_options_t *options = get_options();
- if (desc_clean_since !force)
-return 0;
-
- if (router_pick_published_address(options, addr) 0 ||
- router_get_advertised_or_port(options) == 0) {
-/* Stop trying to rebuild our descriptor every second. We'll
- * learn that it's time to try again when ip_address_changed()
- * marks it dirty. */
-desc_clean_since = time(NULL);
+ if (router_pick_published_address(options, addr) 0) {
+log_warn(LD_CONFIG, Don't know my address while generating descriptor);
return -1;
}
- log_info(LD_OR, Rebuilding relay descriptor%s, force ? (forced) : );
-
ri = tor_malloc_zero(sizeof(routerinfo_t));
ri-cache_info.routerlist_index = -1;
ri-nickname = tor_strdup(options-Nickname);
@@ -2024,6 +2018,41 @@ router_rebuild_descriptor(int force)
tor_assert(! routerinfo_incompatible_with_extrainfo(ri, ei, NULL, NULL));
}
+ *r = ri;
+ *e = ei;
+ return 0;
+}
+
+/** If bforce/b is true, or our descriptor is out-of-date, rebuild a fresh
+ * routerinfo, signed server descriptor, and extra-info document for this OR.
+ * Return 0 on success, -1 on temporary error.
+ */
+int
+router_rebuild_descriptor(int force)
+{
+ routerinfo_t *ri;
+ extrainfo_t *ei;
+ uint32_t addr;
+ const or_options_t *options = get_options();
+
+ if (desc_clean_since !force)
+return 0;
+
+ if (router_pick_published_address(options, addr) 0 ||
+ router_get_advertised_or_port(options) == 0) {
+/* Stop trying to rebuild our descriptor every second. We'll
+ * learn that it's time to try again when ip_address_changed()
+ * marks it dirty. */
+desc_clean_since = time(NULL);
+return -1;
+ }
+
+ log_info(LD_OR, Rebuilding relay descriptor%s, force ? (forced) : );
+
+ if (router_build_fresh_descriptor(ri, ei) 0) {
+return -1;
+ }
+
routerinfo_free(desc_routerinfo);
desc_routerinfo = ri;
extrainfo_free(desc_extrainfo);
diff --git a/src/or/router.h b/src/or/router.h
index 8108ffb..73b43bc 100644
--- a/src/or/router.h
+++ b/src/or/router.h
@@ -89,6 +89,7 @@ const uint8_t *router_get_my_id_digest(void);
int router_extrainfo_digest_is_me(const char *digest);
int router_is_me(const routerinfo_t *router);
int router_pick_published_address(const or_options_t *options, uint32_t *addr);
+int router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e);
int router_rebuild_descriptor(int force);
char *router_dump_router_to_string(routerinfo_t *router,
crypto_pk_t *ident_key);
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Implement status/fresh-relay-descs command
commit 0c11d8b2d218b48ede19601bb7400639e3883a9c
Author: Sebastian Hahn sebast...@torproject.org
Date: Sun Feb 15 12:33:33 2015 +0100
Implement status/fresh-relay-descs command
The idea here is that a controller should be able to make Tor produce a
new relay descriptor on demand, without that descriptor actually being
uploaded to the dirauths (they would likely reject it anyway due to
freshness concerns).
Implements #14784.
---
changes/bug14784 |4
src/or/control.c | 43 +++
2 files changed, 47 insertions(+)
diff --git a/changes/bug14784 b/changes/bug14784
new file mode 100644
index 000..1f50142
--- /dev/null
+++ b/changes/bug14784
@@ -0,0 +1,4 @@
+ o Minor features:
+- Implement a new controller command status/fresh-relay-descs to
+ fetch a descriptor/extrainfo pair that was generated on demand
+ just for the controller's use. Implements ticket 14784.
diff --git a/src/or/control.c b/src/or/control.c
index 064b745..2977b8b 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -2100,6 +2100,47 @@ getinfo_helper_events(control_connection_t *control_conn,
return -1;
}
*answer = bridge_stats;
+} else if (!strcmp(question, status/fresh-relay-descs)) {
+if (!server_mode(get_options())) {
+ *errmsg = Only relays have descriptors;
+ return -1;
+}
+routerinfo_t *r;
+extrainfo_t *e;
+if (router_build_fresh_descriptor(r, e) 0) {
+ *errmsg = Error generating descriptor;
+ return -1;
+}
+size_t size = r-cache_info.signed_descriptor_len + 1;
+if (e) {
+ size += e-cache_info.signed_descriptor_len + 1;
+}
+tor_assert(r-cache_info.signed_descriptor_len);
+char *descs = tor_malloc(size);
+char *cp = descs;
+memcpy(cp, signed_descriptor_get_body(r-cache_info),
+ r-cache_info.signed_descriptor_len);
+cp += r-cache_info.signed_descriptor_len - 1;
+if (e) {
+ if (cp[0] == '\0') {
+cp[0] = '\n';
+ } else if (cp[0] != '\n') {
+cp[1] = '\n';
+cp++;
+ }
+ memcpy(cp, signed_descriptor_get_body(e-cache_info),
+ e-cache_info.signed_descriptor_len);
+ cp += e-cache_info.signed_descriptor_len - 1;
+}
+if (cp[0] == '\n') {
+ cp[0] = '\0';
+} else if (cp[0] != '\0') {
+ cp[1] = '\0';
+}
+log_warn(LD_CONFIG, %s, descs);
+*answer = descs;
+routerinfo_free(r);
+extrainfo_free(e);
} else {
return 0;
}
@@ -2210,6 +2251,8 @@ static const getinfo_item_t getinfo_items[] = {
The last bootstrap phase status event that Tor sent.),
DOC(status/clients-seen,
Breakdown of client countries seen by a bridge.),
+ DOC(status/fresh-relay-descs,
+ A fresh relay/ei descriptor pair for Tor's current state. Not stored.),
DOC(status/version/recommended, List of currently recommended versions.),
DOC(status/version/current, Status of the current version.),
DOC(status/version/num-versioning, Number of versioning authorities.),
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/bug14784'
commit b98cc79477e5eb70284bb70dc80d778d5d082cc1 Merge: c3e8b7f 0c11d8b Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 15 11:10:37 2015 -0400 Merge remote-tracking branch 'sebastian/bug14784' changes/bug14784 |4 src/or/control.c | 43 +++ src/or/router.c | 59 -- src/or/router.h |1 + 4 files changed, 92 insertions(+), 15 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Remove spurious warn
commit 1a7dea9191585853fe9b3e591a98620c994111cf
Author: Nick Mathewson ni...@torproject.org
Date: Wed Apr 15 11:04:17 2015 -0400
Remove spurious warn
---
src/or/control.c |1 -
1 file changed, 1 deletion(-)
diff --git a/src/or/control.c b/src/or/control.c
index a34eb0d..fde3990 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -2137,7 +2137,6 @@ getinfo_helper_events(control_connection_t *control_conn,
} else if (cp[0] != '\0') {
cp[1] = '\0';
}
-log_warn(LD_CONFIG, %s, descs);
*answer = descs;
routerinfo_free(r);
extrainfo_free(e);
___
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 e9225ba3b57eb2f344f490295254d05e62097077 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 15:45:38 2015 + Update translations for tails-misc --- id.po | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/id.po b/id.po index 048e228..d5a4422 100644 --- a/id.po +++ b/id.po @@ -4,15 +4,16 @@ # # Translators: # Astryd Viandila Dahlan astrydviand...@yahoo.com, 2015 -# Gregori, 2014 +# Dwi Cahyono, 2015 +# Ibnu Daru AJi, 2014 # L1Nus multazam_...@me.com, 2014 msgid msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2015-02-23 16:25+0100\n -PO-Revision-Date: 2015-02-25 08:49+\n -Last-Translator: runasand runa.sand...@gmail.com\n +POT-Creation-Date: 2015-03-30 16:51+0200\n +PO-Revision-Date: 2015-04-15 15:43+\n +Last-Translator: Dwi Cahyono\n Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -20,11 +21,11 @@ msgstr Language: id\n Plural-Forms: nplurals=1; plural=0;\n -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43 msgid Tor is ready msgstr Tor telah siap -#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43 +#: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44 msgid You can now access the Internet. msgstr Sekarang Anda dapat mengakses internet. @@ -58,7 +59,7 @@ msgstr #: config/chroot_local-includes/usr/local/bin/electrum:18 msgid Do you want to start Electrum anyway? -msgstr +msgstr Apakah Anda ingin memulai Electrum? #: config/chroot_local-includes/usr/local/bin/electrum:20 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36 @@ -428,7 +429,7 @@ msgstr Peramban tak aman lain sedang berjalan, atau sedang dibersihkan. Silakan msgid NetworkManager passed us garbage data when trying to deduce the clearnet DNS server. -msgstr +msgstr Pengelola Jaringan mengirimi kita data tidak berguna ketika #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:115 msgid @@ -442,11 +443,11 @@ msgstr Gagal mengkonfigurasi chroot. #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:129 msgid Failed to configure browser. -msgstr +msgstr Konfigurasi peramban gagal. #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:134 msgid Failed to run browser. -msgstr +msgstr Gagal menjalankan peramban. #: config/chroot_local-includes/usr/local/sbin/tails-i2p:31 msgid I2P failed to start ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit 3a73f66bfb46c2ad5e51a06c6b8280fa01c1a7c6 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 15:45:03 2015 + Update translations for bridgedb --- id/LC_MESSAGES/bridgedb.po |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po index 738963a..e26bf8c 100644 --- a/id/LC_MESSAGES/bridgedb.po +++ b/id/LC_MESSAGES/bridgedb.po @@ -6,6 +6,7 @@ # Anthony Santana, 2014 # Astryd Viandila Dahlan astrydviand...@yahoo.com, 2015 # constantius damar wicaksono constantiusda...@gmail.com, 2015 +# Dwi Cahyono, 2015 # MasIs is.roads...@gmail.com, 2013 # L1Nus multazam_...@me.com, 2014 # km242saya pencuriman...@gmail.com, 2014 @@ -14,8 +15,8 @@ msgstr Project-Id-Version: The Tor Project\n Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n POT-Creation-Date: 2015-02-03 03:24+\n -PO-Revision-Date: 2015-03-04 17:31+\n -Last-Translator: constantius damar wicaksono constantiusda...@gmail.com\n +PO-Revision-Date: 2015-04-15 15:32+\n +Last-Translator: Dwi Cahyono\n Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -281,7 +282,7 @@ msgstr Pilih Semua #: lib/bridgedb/templates/bridges.html:87 msgid Show QRCode -msgstr +msgstr Perlihatkan KodeQR #: lib/bridgedb/templates/bridges.html:100 msgid QRCode for your bridge lines ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug14391_026_v2'
commit 8837cc266e44f8033f32a7d1a05020e585f034c7 Merge: 7e6437b 91009dc Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 15 10:33:04 2015 -0400 Merge remote-tracking branch 'dgoulet/bug14391_026_v2' src/or/connection_edge.c | 59 +- src/or/rendclient.c | 56 ++-- src/or/rendcommon.c | 64 +- 3 files changed, 113 insertions(+), 66 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] changes file for 14391
commit 7e1fa9d63e7ef6d41b78280a73f86a0b17110dfd Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 15 10:34:19 2015 -0400 changes file for 14391 --- changes/bug14391 |5 + 1 file changed, 5 insertions(+) diff --git a/changes/bug14391 b/changes/bug14391 new file mode 100644 index 000..5907372 --- /dev/null +++ b/changes/bug14391 @@ -0,0 +1,5 @@ + + o Code simplification and refactoring: +- Refactor hidden service client-side cache lookup to intelligently + report its various failure cases, and disentangle failure cases + involving a lack of introduction points. Closes ticket 14391. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Refactor rend_cache_lookup_entry() and how it's used
commit 91009dce971655f6b18b5eba5f0c0b48dbd8a737
Author: David Goulet dgou...@ev0ke.net
Date: Mon Jan 26 17:42:42 2015 -0500
Refactor rend_cache_lookup_entry() and how it's used
Here is why:
1) v0 descriptors are deprecated since 0.2.2.1 and not suppose to be alive
in the network anymore. This function should only serve v2 version for now
as the default.
2) It should return different error code depending on what's the actual
error is. Right now, there is no distinction between a cache entry not found
and an invalid query.
3) This function should NOT test if the intro points are usable or not. This
adds some load on a function that should be O(1) and do one job.
Furthermore, multiple callsites actually already test that doing twice the
job...
4) While adding control event, it would be useful to be able to lookup a
cache entry without having it checking the intro points. There are also
places in the code that do want to lookup the cache entry without doing
that.
Fixes #14391
Signed-off-by: David Goulet dgou...@ev0ke.net
---
src/or/connection_edge.c | 59 +-
src/or/rendclient.c | 56 ++--
src/or/rendcommon.c | 64 +-
3 files changed, 113 insertions(+), 66 deletions(-)
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index f541249..3833d16 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1502,23 +1502,45 @@
connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
log_info(LD_REND,Got a hidden service request for ID '%s',
safe_str_client(rend_data-onion_address));
-/* see if we already have a hidden service descriptor cached for this
- * address. */
+/* Lookup the given onion address. If invalid, stop right now else we
+ * might have it in the cache or not, it will be tested later on. */
+unsigned int refetch_desc = 0;
rend_cache_entry_t *entry = NULL;
const int rend_cache_lookup_result =
rend_cache_lookup_entry(rend_data-onion_address, -1, entry);
if (rend_cache_lookup_result 0) {
- /* We should already have rejected this address! */
- log_warn(LD_BUG,Invalid service name '%s',
- safe_str_client(rend_data-onion_address));
- connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);
- return -1;
+ switch (-rend_cache_lookup_result) {
+ case EINVAL:
+/* We should already have rejected this address! */
+log_warn(LD_BUG,Invalid service name '%s',
+safe_str_client(rend_data-onion_address));
+connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);
+return -1;
+ case ENOENT:
+refetch_desc = 1;
+break;
+ default:
+log_warn(LD_BUG, Unknown cache lookup error %d,
+rend_cache_lookup_result);
+return -1;
+ }
}
/* Help predict this next time. We're not sure if it will need
* a stable circuit yet, but we know we'll need *something*. */
rep_hist_note_used_internal(now, 0, 1);
+/* Now we have a descriptor but is it usable or not? If not, refetch.
+ * Also, a fetch could have been requested if the onion address was not
+ * found in the cache previously. */
+if (refetch_desc || !rend_client_any_intro_points_usable(entry)) {
+ base_conn-state = AP_CONN_STATE_RENDDESC_WAIT;
+ log_info(LD_REND, Unknown descriptor %s. Fetching.,
+ safe_str_client(rend_data-onion_address));
+ rend_client_refetch_v2_renddesc(rend_data);
+ return 0;
+}
+
/* Look up if we have client authorization configured for this hidden
* service. If we do, associate it with the rend_data. */
rend_service_authorization_t *client_auth =
@@ -1532,22 +1554,13 @@
connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
rend_data-auth_type = client_auth-auth_type;
}
-/* Now, we either launch an attempt to connect to the hidden service,
- * or we launch an attempt to look up its descriptor, depending on
- * whether we had the descriptor. */
-if (rend_cache_lookup_result == 0) {
- base_conn-state = AP_CONN_STATE_RENDDESC_WAIT;
- log_info(LD_REND, Unknown descriptor %s. Fetching.,
- safe_str_client(rend_data-onion_address));
- rend_client_refetch_v2_renddesc(rend_data);
-} else { /* rend_cache_lookup_result 0 */
- base_conn-state = AP_CONN_STATE_CIRCUIT_WAIT;
- log_info(LD_REND, Descriptor is here. Great.);
- if (connection_ap_handshake_attach_circuit(conn) 0) {
-if (!base_conn-marked_for_close)
- connection_mark_unattached_ap(conn, END_STREAM_REASON_CANT_ATTACH);
-return -1;
- }
+/* We have the descriptor so launch a connection to the
[tor-commits] [tor/master] Merge remote-tracking branch 'teor/fix-spaces-20150415'
commit eec58c35482d4425fccf38d632035319b56f795e Merge: 7e1fa9d af2b6bd Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 15 10:37:55 2015 -0400 Merge remote-tracking branch 'teor/fix-spaces-20150415' src/common/crypto.h |1 + src/test/test-memwipe.c |7 +-- 2 files changed, 6 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Fix another space issue
commit c3e8b7f2da7f5c7fc4d341b533b7031eab90a665 Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 15 10:38:12 2015 -0400 Fix another space issue --- src/or/rendcommon.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 775d2b9..3fea07f 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -963,7 +963,7 @@ rend_cache_lookup_entry(const char *query, int version, rend_cache_entry_t **e) *e = entry; } -end: + end: return ret; } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Fix spaces in crypto.h and test-memwipe.c
commit af2b6bdaba85d617f9eb93c67457f8b89b088b2d
Author: teor teor2...@gmail.com
Date: Wed Apr 15 19:42:41 2015 +1000
Fix spaces in crypto.h and test-memwipe.c
---
src/common/crypto.h |1 +
src/test/test-memwipe.c |7 +--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/common/crypto.h b/src/common/crypto.h
index 440ff23..b9c26a4 100644
--- a/src/common/crypto.h
+++ b/src/common/crypto.h
@@ -296,3 +296,4 @@ struct dh_st *crypto_dh_get_dh_(crypto_dh_t *dh);
void crypto_add_spaces_to_fp(char *out, size_t outlen, const char *in);
#endif
+
diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
index a721a8e..815475a 100644
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@ -148,8 +148,11 @@ check_heap_buffer(void)
static struct testcase {
const char *name;
- unsigned (*fill_fn)(void);
- unsigned (*check_fn)(void);
+ /* this spacing satisfies make check-spaces */
+ unsigned
+(*fill_fn)(void);
+ unsigned
+(*check_fn)(void);
} testcases[] = {
{ nil, fill_a_buffer_nothing, check_a_buffer },
{ nil-heap, fill_heap_buffer_nothing, check_heap_buffer },
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] Remove note about wildcard transport; see #15612
commit a95724915096956ceff80856a4176f081660ca9c Author: Nick Mathewson ni...@torproject.org Date: Wed Apr 15 10:53:31 2015 -0400 Remove note about wildcard transport; see #15612 --- pt-spec.txt |1 - 1 file changed, 1 deletion(-) diff --git a/pt-spec.txt b/pt-spec.txt index aea7fd5..43ae73f 100644 --- a/pt-spec.txt +++ b/pt-spec.txt @@ -103,7 +103,6 @@ connection | +---+^ ++ | whichever one is listed first. TODO: Document external mode - TODO: Document '*' transport 2.1.0.1. Bridge torrc lines ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Fix indentation on a block
commit cc10f13408e25eaf04f849d0f761680f383fa61d
Author: Nick Mathewson ni...@torproject.org
Date: Wed Apr 15 11:05:09 2015 -0400
Fix indentation on a block
---
src/or/control.c | 76 +++---
1 file changed, 38 insertions(+), 38 deletions(-)
diff --git a/src/or/control.c b/src/or/control.c
index fde3990..d4216d2 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -2101,45 +2101,45 @@ getinfo_helper_events(control_connection_t
*control_conn,
}
*answer = bridge_stats;
} else if (!strcmp(question, status/fresh-relay-descs)) {
-if (!server_mode(get_options())) {
- *errmsg = Only relays have descriptors;
- return -1;
-}
-routerinfo_t *r;
-extrainfo_t *e;
-if (router_build_fresh_descriptor(r, e) 0) {
- *errmsg = Error generating descriptor;
- return -1;
-}
-size_t size = r-cache_info.signed_descriptor_len + 1;
-if (e) {
- size += e-cache_info.signed_descriptor_len + 1;
-}
-tor_assert(r-cache_info.signed_descriptor_len);
-char *descs = tor_malloc(size);
-char *cp = descs;
-memcpy(cp, signed_descriptor_get_body(r-cache_info),
- r-cache_info.signed_descriptor_len);
-cp += r-cache_info.signed_descriptor_len - 1;
-if (e) {
- if (cp[0] == '\0') {
-cp[0] = '\n';
- } else if (cp[0] != '\n') {
-cp[1] = '\n';
-cp++;
- }
- memcpy(cp, signed_descriptor_get_body(e-cache_info),
- e-cache_info.signed_descriptor_len);
- cp += e-cache_info.signed_descriptor_len - 1;
-}
-if (cp[0] == '\n') {
- cp[0] = '\0';
-} else if (cp[0] != '\0') {
- cp[1] = '\0';
+ if (!server_mode(get_options())) {
+*errmsg = Only relays have descriptors;
+return -1;
+ }
+ routerinfo_t *r;
+ extrainfo_t *e;
+ if (router_build_fresh_descriptor(r, e) 0) {
+*errmsg = Error generating descriptor;
+return -1;
+ }
+ size_t size = r-cache_info.signed_descriptor_len + 1;
+ if (e) {
+size += e-cache_info.signed_descriptor_len + 1;
+ }
+ tor_assert(r-cache_info.signed_descriptor_len);
+ char *descs = tor_malloc(size);
+ char *cp = descs;
+ memcpy(cp, signed_descriptor_get_body(r-cache_info),
+ r-cache_info.signed_descriptor_len);
+ cp += r-cache_info.signed_descriptor_len - 1;
+ if (e) {
+if (cp[0] == '\0') {
+ cp[0] = '\n';
+} else if (cp[0] != '\n') {
+ cp[1] = '\n';
+ cp++;
}
-*answer = descs;
-routerinfo_free(r);
-extrainfo_free(e);
+memcpy(cp, signed_descriptor_get_body(e-cache_info),
+ e-cache_info.signed_descriptor_len);
+cp += e-cache_info.signed_descriptor_len - 1;
+ }
+ if (cp[0] == '\n') {
+cp[0] = '\0';
+ } else if (cp[0] != '\0') {
+cp[1] = '\0';
+ }
+ *answer = descs;
+ routerinfo_free(r);
+ extrainfo_free(e);
} else {
return 0;
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Merge pull request #38 from anadahz/test-spec/meek
commit d98e4edd3a9ae021247a0a7109c87775c5cd8d48 Merge: c01997f b230876 Author: Arturo Filastò art...@filasto.net Date: Wed Apr 15 19:05:04 2015 +0200 Merge pull request #38 from anadahz/test-spec/meek Add meek fronted requests test specification test-specs/ts-013-meek_fronted_requests.md | 108 1 file changed, 108 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Add meek fronted requests test specification
commit b2308768e776189c385dffc5a394ec4bcfbb73cd
Author: V auser@0
Date: Sun Apr 5 18:30:06 2015 +0200
Add meek fronted requests test specification
---
test-specs/ts-013-meek_fronted_requests.md | 108
1 file changed, 108 insertions(+)
diff --git a/test-specs/ts-013-meek_fronted_requests.md
b/test-specs/ts-013-meek_fronted_requests.md
new file mode 100644
index 000..f211cc4
--- /dev/null
+++ b/test-specs/ts-013-meek_fronted_requests.md
@@ -0,0 +1,108 @@
+# Specification version number
+
+2015-04-01-000
+
+# Specification name
+
+Meek Fronted Request Test
+
+# Test preconditions
+
+* An internet connection
+
+# Expected impact
+
+Ability to detect uncensored fronted domains that can transmit requests to the
+inside meek-server via an intermediary web service.
+
+# Expected inputs
+
+## Import document or import data format
+
+A list of domain names (fronted domains) and host headers (meek-server) of the
+intermediary web service.
+
+## Semantics
+
+The input document may contain a domain name and a host header combination per
+line separated by colon in the format:
+
+ DomainName:HostHeader
+
+Example:
+
+ www.google.com:meek-reflect.appspot.com
+ a0.awsstatic.com:d2zfqthxsdq309.cloudfront.net
+
+# Test description
+
+Performs a HTTP GET request to a list of fronted domains with the Host
+Header of the inside meek-server. The meek-server handles a GET request and
+response with: Iâm just a happy little web server.\n.
+
+# Expected output
+
+## Parent data format
+
+df-001-httpt-000
+
+## Required output data
+
+* The domain name and host header used in the measurement
+ (DomainName:HostHeader)
+
+* The requests that have been made
+
+* The received responses
+
+* If the meek request is blocked
+
+## Semantics
+
+censored:
+ **boolean** indicates if an HTTP GET response to the meek server is
+ successfull
+
+## Possible conclusions
+
+If the fronted request/response to the meek server is successful.
+
+## Example output sample
+
+```
+agent: agent
+censored: false
+input: ajax.aspnetcdn.com:az668014.vo.msecnd.net
+requests:
+- request:
+body: null
+headers:
+- - Host
+ - [az668014.vo.msecnd.net]
+method: GET
+tor: {is_tor: false}
+url: https://ajax.aspnetcdn.com
+ response:
+body: I\u2019m just a happy little web server.\n
+code: 200
+headers:
+- - Content-Length
+ - ['38']
+- - X-Cache
+ - [HIT]
+- - X-Powered-By
+ - [ASP.NET]
+- - Accept-Ranges
+ - [bytes]
+- - Server
+ - [ECAcc (fcn/40C4)]
+- - Last-Modified
+ - ['Wed, 01 Apr 2015 09:25:13 GMT']
+- - Connection
+ - [close]
+- - Date
+ - ['Wed, 01 Apr 2015 10:01:37 GMT']
+- - Content-Type
+ - [text/plain; charset=utf-8]
+socksproxy: null
+```
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] fix typo
commit fac37d882ab48944f827b8855bdf94900e862d5e
Author: Arturo Filastò art...@filasto.net
Date: Wed Feb 4 13:27:05 2015 +0100
fix typo
---
oonib.md |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/oonib.md b/oonib.md
index e653b02..88ab62a 100644
--- a/oonib.md
+++ b/oonib.md
@@ -641,7 +641,7 @@ This way the client sends:
'net-tests': [
{
'test-helpers': ['required test helper', ...],
-'input-hashed': ['required input id', ...],
+'input-hashes': ['required input id', ...],
'name': 'name of nettest',
'version': 'version of nettest'
},
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Add informed consent text prepared by Dan O'Huiginn in https://lists.torproject.org/pipermail/ooni-dev/2015-January/000208.html
commit b2f5b1ccc4f76ebb7c0fb69c6a44992607ca6313 Author: Arturo Filastò a...@fuffa.org Date: Mon Mar 16 13:19:04 2015 +0100 Add informed consent text prepared by Dan O'Huiginn in https://lists.torproject.org/pipermail/ooni-dev/2015-January/000208.html --- informed-consent/inform-users-long.md | 55 informed-consent/inform-users-short.md | 10 ++ 2 files changed, 65 insertions(+) diff --git a/informed-consent/inform-users-long.md b/informed-consent/inform-users-long.md new file mode 100644 index 000..fdfebbd --- /dev/null +++ b/informed-consent/inform-users-long.md @@ -0,0 +1,55 @@ +# LEGALITY + +OONI does several things which may be illegal in your country, and/or +banned by your ISP. + +OONI's http test will download data from controversial websites, +specifically targeting those which may be censored in your country. +These may include, for example, sites containing pornography or hate +speech. You can find a list of sites checked at +https://github.com/citizenlab/test-lists + +Even where these sites are not blocked, it may be illegal to access +them. It may also be illegal to bypass censorship, as OONI attempts by +using Tor. + +In the most extreme case, any form of network monitoring could be +illegal or banned, or even considered a form of espionage. + +[Include link to some resource on relevant laws globally. Someone like +the EFF must have one of these; does anybody have a link?] + +# PRIVACY + +OONI IS NOT DESIGNED TO PROTECT YOUR PRIVACY. It will reveal information +about your internet connection to the whole world. Particular groups, +such as your ISP and web services used by the ooni tests, will be able +to discover even more detailed information about you. + +THE PUBLIC will be able to see the information collected by OONIprobe. +This will definitely include your approximate location, the network +(ASN) you are connecting from, and when you ran ooniprobe. Other +identifying information, such as your IP address, is not deliberately +collected, but may be included in HTTP headers or other metadata. The +full page content downloaded by OONI could potentially include further +information, for example if a website includes tracking codes or custom +content based on your network location. + +You can see what information OONI releases to the public at +https://ooni.torproject.org/reports/. You should expect this information +to remain online PERMANENTLY. [include details of retention policy, once +we have one] + +THE OONI PROJECT will also be able to see your IP address [What other +info do we get?] + +ORGANIZATIONS MONITORING YOUR INTERNET CONNECTION will be able to see +all web traffic generated by OONI, including your IP address, and will +likely be able to link it to you personally. These organizations might +include your government, your ISP, and your employer. + +ANYBODY WITH ACCESS TO YOUR COMPUTER, now or in the future, may be able +to detect that you have installed or run ooni + +SERVICES CONNECTED TO BY OONI will be able to see your IP address, and +may be able to detect that you are using OONI diff --git a/informed-consent/inform-users-short.md b/informed-consent/inform-users-short.md new file mode 100644 index 000..0422d5a --- /dev/null +++ b/informed-consent/inform-users-short.md @@ -0,0 +1,10 @@ +WARNING: Running OONI may be illegal in your country, or forbidden by +your ISP. By running OONI you will connect to web services which may be +banned, and use web censorship circumvention methods such as Tor. The +OONI project will publish data submitted by probes, possibly including +your IP address or other identifying information. In addition, your use +of OONI will be clear to anybody who has access to your computer, and to +anybody who can monitor your internet connection (such as your employer, +ISP or government). + +[link to long version] ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [ooni-probe/master] 13602: build a binary of bin/ooniprobe that we can setcap on to avoid running as root
commit 7b01492e082550a0917bb9141601fdfdd41fd79f
Author: Ximin Luo infini...@pwned.gg
Date: Sun Mar 1 14:54:09 2015 +0100
13602: build a binary of bin/ooniprobe that we can setcap on to avoid
running as root
---
bin/Makefile | 81 +
bin/test/ooni/__init__.py |1 +
2 files changed, 82 insertions(+)
diff --git a/bin/Makefile b/bin/Makefile
new file mode 100644
index 000..bc80843
--- /dev/null
+++ b/bin/Makefile
@@ -0,0 +1,81 @@
+# Wrappers for running ooniprobe as a non-root user.
+#
+# Build-Depends: cython, pythonX.Y-dev, libcap2-bin
+# Depends: libpythonX.Y
+#
+# $ make make check
+# $ sudo make install # after installing the rest of ooni-probe
+# $ make installcheck_unsafe # runs complete tests as non-root
+#
+# `make` builds a program that has file capabilities set on it. This is just
+# ./ooniprobe compiled into a C program using Cython, so that one can set
+# capabilities directly on the resulting binary. This way, we avoid the need
+# for a separate child python interpreter with its own capabilities. Another
+# advantage is that libpython.so (needed by the program) would be automatically
+# upgraded by the system package manager. The version of python is hard-coded
+# into the wrapper at build time; making this dynamic is possible, but much
+# more complex and not yet implemented.
+#
+# Execution may additionally be limited to a particular unix group by using
+# chgrp(1) and chmod(1) to 'o-x,g+x' after installation.
+#
+
+# GNU Makefile conventions, see
https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html
+prefix = /usr/local
+exec_prefix = $(prefix)
+bindir = $(exec_prefix)/bin
+
+INSTALL = install
+PYTHON = python
+PYTHON_CONFIG = python-config
+CYTHON = cython
+SETCAP = setcap
+
+INSTALL_PROGRAM = $(INSTALL)
+PY_CFLAGS = $(shell $(PYTHON_CONFIG) --cflags)
+PY_LDFLAGS = $(shell $(PYTHON_CONFIG) --ldflags)
+
+BUILDDIR := ./build
+SCRIPTDIR := .
+TESTDIR := ./test
+CAP_SCRIPT := ooniprobe
+CAP_NEEDED := cap_net_admin,cap_net_raw
+
+# Unfortunately cython --embed ignores the arguments in the shebang line
+# So we need to patch the generated code ourselves.
+CYTHON_PRE_MAIN = extern int Py_IgnoreEnvironmentFlag; \
+ Py_IgnoreEnvironmentFlag++; \
+ extern int Py_NoUserSiteDirectory; \
+ Py_NoUserSiteDirectory++;
+
+all: $(BUILDDIR)/$(CAP_SCRIPT)
+
+$(BUILDDIR)/$(CAP_SCRIPT): $(BUILDDIR)/$(CAP_SCRIPT).c Makefile
+ $(CC) $(PY_CFLAGS) $(PY_LDFLAGS) $ -o $@
+
+$(BUILDDIR)/$(CAP_SCRIPT).c: $(SCRIPTDIR)/$(CAP_SCRIPT) Makefile
+ mkdir -p $(BUILDDIR)
+ $(CYTHON) $ --embed=CYTHON_MAIN_SENTINEL -Werror -Wextra -o $@
+ sed -i \
+ -e 's/\(.*CYTHON_MAIN_SENTINEL.*{\)/\1 $(CYTHON_PRE_MAIN)/g' \
+ -e '/CYTHON_MAIN_SENTINEL[^{]*$$/,/{/s/{/{ $(CYTHON_PRE_MAIN)/g' \
+ -e 's/CYTHON_MAIN_SENTINEL/main/g' $@
+
+check: $(BUILDDIR)/$(CAP_SCRIPT)
+ # test that setcapped binary ignores PYTHONPATH
+ BIN=$$(realpath $) cd $(TESTDIR) PYTHONPATH=. $$BIN
--version
+
+install: $(BUILDDIR)/$(CAP_SCRIPT)
+ mkdir -p $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) -t $(DESTDIR)$(bindir) $(BUILDDIR)/$(CAP_SCRIPT)
+ $(SETCAP) $(CAP_NEEDED)+eip $(DESTDIR)$(bindir)/$(CAP_SCRIPT)
+
+installcheck_unsafe: $(BUILDDIR)/$(CAP_SCRIPT)
+ # run a standard check. note that because of hardcoded paths (for
security)
+ # this can only work after you've installed your development copy
+ ./$ -i /usr/share/ooni/decks/complete.deck
+
+clean:
+ rm -rf $(BUILDDIR)
+
+.PHONY: clean all check install installcheck%
diff --git a/bin/test/ooni/__init__.py b/bin/test/ooni/__init__.py
new file mode 100644
index 000..f2cd353
--- /dev/null
+++ b/bin/test/ooni/__init__.py
@@ -0,0 +1 @@
+raise ValueError(test failed! wrapper did not ignore polluted PWD. either the
wrapper is faulty, or ooni is still unpatched (Tor bug #13581))
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Fix markup of example
commit 93027244eeb36060fc4482073ad1ae0b676f5acd
Author: Arturo Filastò art...@filasto.net
Date: Fri Jan 16 17:53:52 2015 +0100
Fix markup of example
---
test-specs/ts-006-header-field-manipulation.md | 226 +---
1 file changed, 3 insertions(+), 223 deletions(-)
diff --git a/test-specs/ts-006-header-field-manipulation.md
b/test-specs/ts-006-header-field-manipulation.md
index e04d66b..8a121ff 100644
--- a/test-specs/ts-006-header-field-manipulation.md
+++ b/test-specs/ts-006-header-field-manipulation.md
@@ -118,6 +118,8 @@ headers not present in both the sent and received headers.
## Example output sample
+
+```
###
# OONI Probe Report for http_header_field_manipulation (0.1.3)
# Wed Oct 9 10:57:42 2013
@@ -141,185 +143,6 @@ headers not present in both the sent and received headers.
- request:
body: null
headers:
- - - ACCePT-LAnGuagE
-- ['en-US,en;q=0.8']
- - - aCCEPT-ENcODInG
-- ['gzip,deflate,sdch']
- - - aCcEPT
-- ['text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8']
- - - User-AGeNt
-- ['Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.1.7)
Gecko/20091221
-Firefox/3.5.7']
- - - aCCEpt-cHArSEt
-- ['ISO-8859-1,utf-8;q=0.7,*;q=0.3']
- - - HOsT
-- [KIXnnZDJfGKRNab.com]
- method: GET
- url: http://12.34.56.78
-response:
- body: '{headers_dict: {ACCePT-LAnGuagE: [en-US,en;q=0.8],
aCCEPT-ENcODInG:
-[gzip,deflate,sdch], HOsT: [KIXnnZDJfGKRNab.com], aCcEPT:
[text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8],
-User-AGeNt: [Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US;
rv:1.9.1.7)
-Gecko/20091221 Firefox/3.5.7], aCCEpt-cHArSEt:
[ISO-8859-1,utf-8;q=0.7,*;q=0.3],
-Connection: [close]}, request_line: GET / HTTP/1.1,
request_headers:
-[[Connection, close], [ACCePT-LAnGuagE, en-US,en;q=0.8],
[aCCEPT-ENcODInG,
-gzip,deflate,sdch], [aCcEPT,
text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8],
-[User-AGeNt, Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US;
rv:1.9.1.7)
-Gecko/20091221 Firefox/3.5.7], [aCCEpt-cHArSEt,
ISO-8859-1,utf-8;q=0.7,*;q=0.3],
-[HOsT, KIXnnZDJfGKRNab.com]]}'
- code: 200
- headers: []
- socksproxy: null
- tampering:
-header_field_name: false
-header_field_number: false
-header_field_value: false
-header_name_capitalization: false
-header_name_diff: []
-request_line_capitalization: false
-total: false
- ...
- ---
- agent: agent
- input: null
- requests:
- - request:
- body: null
- headers:
- - - accePt-LAnguAGE
-- ['en-US,en;q=0.8']
- - - AcCEpT-eNCOdinG
-- ['gzip,deflate,sdch']
- - - accept
-- ['text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8']
- - - UseR-aGENt
-- ['Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.2)
Gecko/20100115 Firefox/3.6']
- - - aCcEPT-cHARSeT
-- ['ISO-8859-1,utf-8;q=0.7,*;q=0.3']
- - - HoSt
-- [AjzqKfZkMpoRf8r.com]
- method: POst
- url: http://12.34.56.78
-response:
- body: '{headers_dict: {accePt-LAnguAGE: [en-US,en;q=0.8],
AcCEpT-eNCOdinG:
-[gzip,deflate,sdch], HoSt: [AjzqKfZkMpoRf8r.com], accept:
[text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8],
-UseR-aGENt: [Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.2)
Gecko/20100115
-Firefox/3.6], aCcEPT-cHARSeT: [ISO-8859-1,utf-8;q=0.7,*;q=0.3],
Connection:
-[close]}, request_line: POst / HTTP/1.1, request_headers:
[[Connection,
-close], [accePt-LAnguAGE, en-US,en;q=0.8], [AcCEpT-eNCOdinG,
gzip,deflate,sdch],
-[accept,
text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8],
-[UseR-aGENt, Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.2)
Gecko/20100115
-Firefox/3.6], [aCcEPT-cHARSeT, ISO-8859-1,utf-8;q=0.7,*;q=0.3],
[HoSt,
-AjzqKfZkMpoRf8r.com]]}'
- code: 200
- headers: []
- socksproxy: null
- tampering:
-header_field_name: false
-header_field_number: false
-header_field_value: false
-header_name_capitalization: false
-header_name_diff: []
-request_line_capitalization: false
-total: false
- ...
- ---
- agent: agent
- input: null
- requests:
- - request:
- body: null
- headers:
- - - Accept-Language
-- ['en-US,en;q=0.8']
- - - Accept-Encoding
-- ['gzip,deflate,sdch']
- - - Accept
-- ['text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8']
- - - User-Agent
-- ['Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2)
Gecko/20100115
-Firefox/3.6']
- - - Accept-Charset
-- ['ISO-8859-1,utf-8;q=0.7,*;q=0.3']
- - - Host
-- [NViZZh58LWHFnyp.com]
- method: PUT
[tor-commits] [ooni-probe/master] Merge pull request #380 from infinity0/master
commit 4f8f1b154eba975636b47329179c79ed8370ceed Merge: 4fe2884 7b01492 Author: Arturo Filastò art...@filasto.net Date: Fri Apr 3 15:28:59 2015 +0200 Merge pull request #380 from infinity0/master 13602: build a binary of bin/ooniprobe that we can setcap on to avoid running as root bin/Makefile | 81 + bin/test/ooni/__init__.py |1 + 2 files changed, 82 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] test-helpers: Addressing comments from hellais in PR #32
commit 657aba53bc76849ba9cf32ee7133d8bebd2ab78e Author: Iain R. Learmonth i...@fsfe.org Date: Mon Dec 15 17:04:37 2014 + test-helpers: Addressing comments from hellais in PR #32 * Corrected vocabulary for the OONI naming conventions * Added a security considerations section to the raw UDP helper * Added a reference for UDP-lite in the raw UDP helper --- test-helpers/th-004-raw-tcp-echo.md |4 ++-- test-helpers/th-005-raw-udp-echo.md | 27 +-- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/test-helpers/th-004-raw-tcp-echo.md b/test-helpers/th-004-raw-tcp-echo.md index 8b9cd54..38a3c92 100644 --- a/test-helpers/th-004-raw-tcp-echo.md +++ b/test-helpers/th-004-raw-tcp-echo.md @@ -1,6 +1,6 @@ # Specification version number -2014-12-08-000 +2014-12-15-000 # Specification name @@ -12,7 +12,7 @@ The Raw TCPEcho Test Helper listens on a TCP port for incoming connections. When a connection is initiated, it accepts the connection, reads a dummy HTTP request and sends an HTTP reply containing an encoding of the IP packets that made up the TCP 3 way handshake [[Wikipedia-3WHS][]] which can be compared -against the packets sent by an ooniprobe test. +against the packets sent by an ooni-probe meter. # Helper preconditions diff --git a/test-helpers/th-005-raw-udp-echo.md b/test-helpers/th-005-raw-udp-echo.md index 3414076..ec7eda7 100644 --- a/test-helpers/th-005-raw-udp-echo.md +++ b/test-helpers/th-005-raw-udp-echo.md @@ -1,6 +1,6 @@ # Specification version number -2014-12-08-000 +2014-12-15-000 # Specification name @@ -10,7 +10,7 @@ Raw UDP Echo Test Helper The Raw UDP Echo Test Helper listens on a UDP port for incoming packets. When a packet is recieved, it sends a UDP packet in reply with the original packet's -header as its payload. +IP and UDP header and payload as the reply's payload. # Helper preconditions @@ -22,9 +22,9 @@ header as its payload. # Expected impact Ability to help an ooni-probe client determine if the UDP header is being -rewritten and if packets are being truncated when UDP-lite is used with a -shorter checksum coverage than the full length of the packet using the UDP -protocol number in the IP header. +rewritten and if packets are being truncated when UDP-lite [[RFC3828][]] is +used with a shorter checksum coverage than the full length of the packet using +the UDP protocol number in the IP header. # Expected inputs @@ -35,7 +35,7 @@ protocol number in the IP header. # Expected output * A UDP packet with the original incoming packet as its payload addressed to - return to the ooniprobe client + return to the ooni-probe meter # Possible conclusions @@ -47,8 +47,23 @@ Possible conclusions that could be drawn from tests using this helper are: for the full length of the packet * Source and destination ports are being rewritten +# Security considerations + +In order to prevent the possibility of this helper being used to set up a +loop where a forged source address causes packets to be sent to another +service that replies to arbitrary UDP packets, such as UDP echo, the first byte +of the payload in the request must have a zero value. Replies will never have a +zero value as this first byte contains the IP protocol version number from the +IP header. + +The possibility of this helper being used for an amplification attack was +considered, but as the amplification factor is limited to the size of an IP and +UDP header, it was not deemed that mitigation for this was necessary. + # Notes An implementation of this test helper is currently being worked on by Iain R. Learmonth i...@fsfe.org using Scapy. +[RFC3828]: http://tools.ietf.org/html/rfc3828 + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Add long informed consent page
commit aa3f22c0701f583a6af3198a5980610322cca45b Author: Arturo Filastò a...@fuffa.org Date: Mon Mar 16 13:31:19 2015 +0100 Add long informed consent page --- informed-consent/inform-users-long.md | 14 ++ 1 file changed, 14 insertions(+) diff --git a/informed-consent/inform-users-long.md b/informed-consent/inform-users-long.md index e76cfd2..e1e21ef 100644 --- a/informed-consent/inform-users-long.md +++ b/informed-consent/inform-users-long.md @@ -1,3 +1,17 @@ +# GOAL + +OONI is a project aimed at mapping network anomalies by performing measurements +from the vantage point of a users. +You may find details on what exactly it is that we measure by reading through +our [test specifications](https://github.com/TheTorProject/ooni-spec/tree/master/test-specs). +The data we collect is then made available to the public for further analysis. + +The goal of this study is to have a better understanding on how the internet +works around the world and what is stopping it from working as it should. + +Please take a minute to go through what can be the possible implications for +running ooniprobe and make sure you properly understand them before proceeding. + # LEGALITY Before running OONI inside of a country with controversial internet access ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Fix meek test spec (PR #38)
commit 45d28710b40effd941fd0af989b6de8cc532747d Author: anadahz kojg...@inbox.com Date: Thu Apr 9 01:46:57 2015 +0200 Fix meek test spec (PR #38) --- test-specs/ts-013-meek_fronted_requests.md | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/test-specs/ts-013-meek_fronted_requests.md b/test-specs/ts-013-meek_fronted_requests.md index f211cc4..f78066e 100644 --- a/test-specs/ts-013-meek_fronted_requests.md +++ b/test-specs/ts-013-meek_fronted_requests.md @@ -36,9 +36,12 @@ Example: # Test description -Performs a HTTP GET request to a list of fronted domains with the Host -Header of the inside meek-server. The meek-server handles a GET request and -response with: Iâm just a happy little web server.\n. +Performs a HTTP GET request over TLS (HTTPS) to a list of fronted domains with +the Host Header of the inside meek-server. For diagnostic purposes the +meek-server handles a GET request and respond with: Iâm just a happy little +web server.\n. The GET request is sent over TLS to the root of the fronted +domain with the Host Header option of the desired meek-server host. + # Expected output @@ -55,12 +58,12 @@ df-001-httpt-000 * The received responses -* If the meek request is blocked +* If the meek server is blocked or unreachable ## Semantics -censored: - **boolean** indicates if an HTTP GET response to the meek server is +success: + **boolean** indicates if an HTTPS GET response to the meek server is successfull ## Possible conclusions @@ -71,7 +74,6 @@ If the fronted request/response to the meek server is successful. ``` agent: agent -censored: false input: ajax.aspnetcdn.com:az668014.vo.msecnd.net requests: - request: @@ -105,4 +107,5 @@ requests: - - Content-Type - [text/plain; charset=utf-8] socksproxy: null +success: true ``` ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Merge pull request #35 from irl/master
commit 902a1ae6c0857f51d172dfc299278541970d1f01 Merge: 87957c3 de49e3f Author: Arturo Filastò art...@filasto.net Date: Wed Mar 25 11:54:18 2015 +0100 Merge pull request #35 from irl/master Added reverse traceroute test helper specification test-helpers/th-006-reverse-traceroute.md | 52 + 1 file changed, 52 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Merge pull request #37 from TheTorProject/feature/report_id_test_helpers
commit c01997fa17dd21ed7e2d3865576f025d8012d90d Merge: 902a1ae e21e84c Author: Arturo Filastò art...@filasto.net Date: Fri Mar 27 11:40:55 2015 +0100 Merge pull request #37 from TheTorProject/feature/report_id_test_helpers Add test_helpers and report_id keys to report header data-formats/df-000-base.md | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Add test_helpers and report_id keys to report header
commit e21e84c736141955852dcd4bfcaa9b8a3e9feb04
Author: Arturo Filastò a...@fuffa.org
Date: Wed Mar 25 11:52:53 2015 +0100
Add test_helpers and report_id keys to report header
---
data-formats/df-000-base.md | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/data-formats/df-000-base.md b/data-formats/df-000-base.md
index 8ca41c8..27120d8 100644
--- a/data-formats/df-000-base.md
+++ b/data-formats/df-000-base.md
@@ -24,7 +24,7 @@ format.
This specification is of the basic data format common to all ooniprobe test
outputs.
-Data Format Version: df-000-base-000
+Data Format Version: df-000-base-001
## Specification
@@ -62,6 +62,12 @@ Data Format Version: df-000-base-000
data_format_version:
The version string of the data format being used by the test (ex.
httpt-000)
+
+report_id:
+ A 64 character mixed case string that is generated by the client used to
identify the report.
+
+test_helpers:
+ A dictionary with as keys the names of the options and values the
addresses of the test helpers used
...
# Example output
@@ -89,6 +95,8 @@ Data Format Version: df-000-base-000
start_time: 1359401639.0
test_name: HTTP Invalid Request Line
test_version: 0.1.3
+test_helpers: {backend: http://93.95.227.200}
+report_id: xxxXXXxXXXXXXxXXXxsxxxXXXxXXXxxxXXXxXXXxxxXXXxX
...
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Merge pull request #36 from TheTorProject/feature/informed-consent
commit 87957c30924ef9be56d7614b87fc5ab03d59b18f Merge: fac37d8 897132e Author: Arturo Filastò art...@filasto.net Date: Mon Mar 16 17:29:06 2015 +0100 Merge pull request #36 from TheTorProject/feature/informed-consent Feature/informed consent informed-consent/inform-users-long.md | 75 informed-consent/inform-users-short.md |8 2 files changed, 83 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Fix issues identified by @bassosimone
commit 897132ef41c4e4201e4fcee4b370cab213725f9a Author: Arturo Filastò a...@fuffa.org Date: Mon Mar 16 16:45:14 2015 +0100 Fix issues identified by @bassosimone --- informed-consent/inform-users-long.md | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/informed-consent/inform-users-long.md b/informed-consent/inform-users-long.md index e1e21ef..80e5134 100644 --- a/informed-consent/inform-users-long.md +++ b/informed-consent/inform-users-long.md @@ -18,8 +18,8 @@ Before running OONI inside of a country with controversial internet access related laws you should consult a lawyer. You may also reach out to us with specific inquiries at le...@ooni.nu. -Some things that OONI does may be against the terms of service of your ISP or -legally questionable by your country. +Some network tests that OONI does may be against the terms of service of your +ISP or legally questionable by your country. OONI's http test will download data from controversial websites, specifically targeting those which may be censored in your country. @@ -31,7 +31,7 @@ Even where these sites are not blocked, it may be illegal to access them. It may also be illegal to bypass censorship, as OONI attempts by using Tor. -In the most extreme case, any form of network monitoring could be +In the most extreme case, any form of active network measurement could be illegal or banned, or even considered a form of espionage. Some useful resources may be: @@ -47,7 +47,7 @@ about your internet connection to the whole world. Particular groups, such as your ISP and web services used by the ooni tests, will be able to discover even more detailed information about you. -THE PUBLIC will be able to see the information collected by OONIprobe. +THE PUBLIC will be able to see the information collected by ooniprobe. This will definitely include your approximate location, the network (ASN) you are connecting from, and when you ran ooniprobe. Other identifying information, such as your IP address, is not deliberately @@ -69,7 +69,7 @@ likely be able to link it to you personally. These organizations might include your government, your ISP, and your employer. ANYBODY WITH ACCESS TO YOUR COMPUTER, now or in the future, may be able -to detect that you have installed or run ooni +to detect that you have installed or run ooni. SERVICES CONNECTED TO BY OONI will be able to see your IP address, and -may be able to detect that you are using OONI +may be able to detect that you are using OONI. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Add DNS Injection test
commit f536f4cf33bd2fef2854b8654abc1319a063979b
Author: Arturo Filastò a...@fuffa.org
Date: Tue Dec 9 12:01:26 2014 +0100
Add DNS Injection test
---
test-specs/ts-012-dns-injection.md | 150
1 file changed, 150 insertions(+)
diff --git a/test-specs/ts-012-dns-injection.md
b/test-specs/ts-012-dns-injection.md
new file mode 100644
index 000..c24a2ee
--- /dev/null
+++ b/test-specs/ts-012-dns-injection.md
@@ -0,0 +1,150 @@
+# Specification version number
+
+2014-12-09-001
+
+# Specification name
+
+DNS Injection test
+
+# Test preconditions
+
+* An internet connection
+
+* An IP address that will traverse a box doing DNS injection triggering an
+ injected DNS response.
+
+# Expected impact
+
+Ability to detect the presence of DNS Injection and list of domains that are
+being blocked via DNS injection.
+
+# Expected inputs
+
+* List of domains to test for injection.
+
+* IP address to send DNS queries to. This IP should not have a DNS resolver
+ listening on port 53 UDP or TCP.
+
+## Semantics
+
+one domain name per line
+
+# Test description
+
+For every domain in the input list we perform a A query towards the target IP
+address using UDP on port 53.
+
+We wait for a DNS response until the timeout (by default 3 seconds) is reached.
+
+If we have received an answer by that time we say that that hostname is being
+injected (since the endpoint is not a DNS resolver the answer we got must have
+been injected by the censorship middle boxes).
+
+If we don't receive an answer that means everything is as usual and we mark
+that hostname as not being injected.
+
+# Expected output
+
+## Parent data format
+
+df-002-dnst
+
+## Required output data
+
+* If the domain as input is being injected or not
+
+## Semantics
+
+injected: true|false
+Indicates if we got an injected response for the domain in question.
+
+## Possible conclusions
+
+If DNS injection is being done and on which domains.
+
+## Example output sample
+
+```
+###
+# OONI Probe Report for dns_injection (0.1)
+# Wed Sep 10 09:34:51 2014
+###
+---
+input_hashes:
[d87e90ead07a7d8ec8f8ca4724807e3fb6c7f1b9471979c934d0dc01b0bd6551]
+options: [-r, 123.58.180.7, -f, domains.txt]
+probe_asn: AS7922
+probe_cc: US
+probe_city: null
+probe_ip: 127.0.0.1
+software_name: ooniprobe
+software_version: 1.1.1
+start_time: 1410356091.339939
+test_name: dns_injection
+test_version: '0.1'
+...
+---
+injected: true
+input: facebook.com
+queries:
+- addrs: [173.252.110.27]
+ answers:
+ - [RR name=facebook.com type=A class=IN ttl=121s auth=False, A
address=173.252.110.27
+ ttl=121]
+ query: '[Query(''facebook.com'', 1, 1)]'
+ query_type: A
+ resolver: [123.58.180.7, 53]
+...
+---
+injected: true
+input: www.twitter.com
+queries:
+- addrs: [199.16.156.198, 199.16.156.230, 199.16.156.6, 199.16.156.102]
+ answers:
+ - [RR name=www.twitter.com type=CNAME class=IN ttl=548s auth=False, CNAME
name=twitter.com
+ ttl=548]
+ - [RR name=twitter.com type=A class=IN ttl=16s auth=False, A
address=199.16.156.198
+ ttl=16]
+ - [RR name=twitter.com type=A class=IN ttl=16s auth=False, A
address=199.16.156.230
+ ttl=16]
+ - [RR name=twitter.com type=A class=IN ttl=16s auth=False, A
address=199.16.156.6
+ ttl=16]
+ - [RR name=twitter.com type=A class=IN ttl=16s auth=False, A
address=199.16.156.102
+ ttl=16]
+ query: '[Query(''www.twitter.com'', 1, 1)]'
+ query_type: A
+ resolver: [123.58.180.7, 53]
+...
+---
+injected: true
+input: youtube.com
+queries:
+- addrs: [173.194.43.35, 173.194.43.36, 173.194.43.37, 173.194.43.38,
173.194.43.39,
+173.194.43.40, 173.194.43.41, 173.194.43.46, 173.194.43.32, 173.194.43.33,
173.194.43.34]
+ answers:
+ - [RR name=youtube.com type=A class=IN ttl=300s auth=False, A
address=173.194.43.35
+ ttl=300]
+ - [RR name=youtube.com type=A class=IN ttl=300s auth=False, A
address=173.194.43.36
+ ttl=300]
+ - [RR name=youtube.com type=A class=IN ttl=300s auth=False, A
address=173.194.43.37
+ ttl=300]
+ - [RR name=youtube.com type=A class=IN ttl=300s auth=False, A
address=173.194.43.38
+ ttl=300]
+ - [RR name=youtube.com type=A class=IN ttl=300s auth=False, A
address=173.194.43.39
+ ttl=300]
+ - [RR name=youtube.com type=A class=IN ttl=300s auth=False, A
address=173.194.43.40
+ ttl=300]
+ - [RR name=youtube.com type=A class=IN ttl=300s auth=False, A
address=173.194.43.41
+ ttl=300]
+ - [RR name=youtube.com type=A class=IN ttl=300s auth=False, A
address=173.194.43.46
+ ttl=300]
+ - [RR name=youtube.com type=A class=IN ttl=300s auth=False, A
address=173.194.43.32
+ ttl=300]
+ - [RR name=youtube.com type=A class=IN ttl=300s auth=False, A
address=173.194.43.33
+ ttl=300]
+ - [RR name=youtube.com type=A class=IN ttl=300s auth=False, A
address=173.194.43.34
+ ttl=300]
+ query: '[Query(''youtube.com'', 1, 1)]'
+
[tor-commits] [spec/master] Update data format with recent changes to it.
commit 73aa34f1123af603fab00d00b5cd1806c9152c45 Author: Arturo Filastò a...@fuffa.org Date: Fri Oct 17 10:32:45 2014 +0200 Update data format with recent changes to it. --- data-formats/df-000-base.md |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data-formats/df-000-base.md b/data-formats/df-000-base.md index 24651d1..812edf0 100644 --- a/data-formats/df-000-base.md +++ b/data-formats/df-000-base.md @@ -108,14 +108,14 @@ input: The item we this specific test instance is referring to. null in case no input is being iterated over. -test_name: +test_method: `string` the name of the test method this test is referring to (that is the class method of a NetTestCase) test_runtime: `float` the runtime of the test -test_started: +test_start_time: `float` seconds since epoch from the starting of the test. # Error strings ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Initial import of taw TCP and UDP echo helpers
commit d04ab0477ae4feb9e038f99661b677f3d01c1289 Author: Iain R. Learmonth i...@fsfe.org Date: Mon Dec 8 15:45:21 2014 + Initial import of taw TCP and UDP echo helpers --- test-helpers/th-004-raw-tcp-echo.md | 67 +++ test-helpers/th-005-raw-udp-echo.md | 54 2 files changed, 121 insertions(+) diff --git a/test-helpers/th-004-raw-tcp-echo.md b/test-helpers/th-004-raw-tcp-echo.md new file mode 100644 index 000..8b9cd54 --- /dev/null +++ b/test-helpers/th-004-raw-tcp-echo.md @@ -0,0 +1,67 @@ +# Specification version number + +2014-12-08-000 + +# Specification name + +Raw TCP Echo Test Helper + +# Helper description + +The Raw TCPEcho Test Helper listens on a TCP port for incoming connections. +When a connection is initiated, it accepts the connection, reads a dummy HTTP +request and sends an HTTP reply containing an encoding of the IP packets that +made up the TCP 3 way handshake [[Wikipedia-3WHS][]] which can be compared +against the packets sent by an ooniprobe test. + +# Helper preconditions + + * An Internet connection + * An Internet-Reachable TCP Port (preferably port 80) + * No known middleboxes rewriting IP or TCP headers in unexpected ways between + the helper and the transit ISP + +# Expected impact + +Ability to help an ooni-probe client determine if the IP or TCP headers have +been modified in transit, possibly indicating that the connection is being +transparently proxied. + +# Expected inputs + + * An HTTP 1.1 [[RFC2616][]] request that should not include any dubious Host: + header or keywords that might attract special treatment + +By emulating an HTTP session, a protocol known to censorship systems and +protocol-enhancing proxies, it will increase the chances to see intereference +occuring over using another protocol that may simply be passed through. + +# Expected output + + * An HTTP 1.1 [[RFC2616][]] reply that includes as its body an encoding of the + packets that made up the TCP 3 way handshake [[Wikipedia-3WHS][]] from the + vantage point of the helper + +The encoding chosen could be simply a binary PCAP trace, a base64 encoded PCAP +trace or even a JSON encoding of a dissector output as long as the dissector is +sufficiently verbose to maximise the usefulness of the helper. + +MIME types like text/html should be avoided as these have a stronger potential +for being rewritten on the wire. + +# Possible conclusions + +Possible conclusions that could be drawn from tests using this helper are: + + * The presence of a transparent proxy + * The presence of network address translation + * The bleaching of bits in the IP and TCP header by badly implemented middleboxes + +# Notes + +An implementation of this test helper is currently being worked on by Iain R. +Learmonth i...@fsfe.org using Scapy. + +[RFC2616]: http://tools.ietf.org/html/rfc2616 +[Wikipedia-3WHS]: http://en.wikipedia.org/wiki/Transmission_Control_Protocol#Connection_establishment + diff --git a/test-helpers/th-005-raw-udp-echo.md b/test-helpers/th-005-raw-udp-echo.md new file mode 100644 index 000..3414076 --- /dev/null +++ b/test-helpers/th-005-raw-udp-echo.md @@ -0,0 +1,54 @@ +# Specification version number + +2014-12-08-000 + +# Specification name + +Raw UDP Echo Test Helper + +# Helper description + +The Raw UDP Echo Test Helper listens on a UDP port for incoming packets. When a +packet is recieved, it sends a UDP packet in reply with the original packet's +header as its payload. + +# Helper preconditions + + * An Internet connection + * An Internet-Reachable UDP Port + * No known middleboxes rewriting UDP headers in unexpected ways between + the helper and the transit ISP + +# Expected impact + +Ability to help an ooni-probe client determine if the UDP header is being +rewritten and if packets are being truncated when UDP-lite is used with a +shorter checksum coverage than the full length of the packet using the UDP +protocol number in the IP header. + +# Expected inputs + + * A UDP packet addressed to the helper + * The destination port should not be one that might attract special treatment + * The payload should not contain keywords that might attract special treatment + +# Expected output + + * A UDP packet with the original incoming packet as its payload addressed to + return to the ooniprobe client + +# Possible conclusions + +Possible conclusions that could be drawn from tests using this helper are: + + * Middleboxes are truncating UDP-lite packets when the UDP protocol number is + used + * Middleboxes are discarding UDP-lite packets with the checksum does not match + for the full length of the packet + * Source and destination ports are being rewritten + +# Notes + +An implementation of this test helper is currently being worked on by Iain R. +Learmonth i...@fsfe.org using Scapy. + ___ tor-commits mailing list tor-commits@lists.torproject.org
[tor-commits] [spec/master] Merge branch 'master' of github.com:TheTorProject/ooni-spec
commit 9ad8dca517efce0c669c39fffe5672c6d66f604a Merge: e651ae7 4525ff6 Author: Arturo Filastò a...@fuffa.org Date: Tue Oct 14 12:37:06 2014 +0200 Merge branch 'master' of github.com:TheTorProject/ooni-spec * 'master' of github.com:TheTorProject/ooni-spec: Improved RESTfulness of the bouncer API. Review of policy aware changes oonib.md | 70 ++ 1 file changed, 66 insertions(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Merge pull request #34 from irl/master
commit e25a2af54d6b557f8e45b1abc76d4dc01cf6620b Merge: b0591bd 657aba5 Author: Arturo Filastò art...@filasto.net Date: Mon Dec 15 18:34:50 2014 +0100 Merge pull request #34 from irl/master test-helpers: Addressing comments from hellais in PR #32 test-helpers/th-004-raw-tcp-echo.md |4 ++-- test-helpers/th-005-raw-udp-echo.md | 27 +-- 2 files changed, 23 insertions(+), 8 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Added reverse traceroute specification
commit de49e3fab389d484f286e3ea87bc9e35cae62f4e Author: Iain R. Learmonth i...@fsfe.org Date: Thu Jan 15 14:57:33 2015 + Added reverse traceroute specification --- test-helpers/th-006-reverse-traceroute.md | 52 + 1 file changed, 52 insertions(+) diff --git a/test-helpers/th-006-reverse-traceroute.md b/test-helpers/th-006-reverse-traceroute.md new file mode 100644 index 000..6a6071d --- /dev/null +++ b/test-helpers/th-006-reverse-traceroute.md @@ -0,0 +1,52 @@ +# Specification version number + +2014-12-15-000 + +# Specification name + +Reverse Traceroute Test Helper + +# Helper description + +The reverse traceroute test helper listens for incoming connections either on +a TCP socket or via a web server. When a connection is initiated, it performs +a reverse traceroute to the connection's source IP address and returns the +results of the traceroute via the same connection. + +# Helper preconditions + + * An Internet connection + * An Internet-Reachable TCP Port + * No known middleboxes rewriting packet payloads in unexpected ways between + the helper and the transit ISP + +# Expected impact + +Through cross-referencing results, the ability to determine where on the +network path network interference exists which could indicate whether or not +the interference is localised to an access ISP or being conducted on a national +level. + +# Expected inputs + + * The initiation of a connection. + +# Expected output + + * The results of a traceroute giving the IP address of each hop and, if + available, the ping times to each hop. + +The encoding chosen could be JSON, CSV, or another format. It should be +possible to convert between this format and the format used by tests that +perform a forward traceroute in ooni-probe. + +# Possible conclusions + +Through cross-referencing of results, it should be possible to determine in +which AS the network interference is occuring. + +# Notes + +An implementation of this test helper is currently being worked on by Iain R. +Learmonth i...@fsfe.org using Scapy. + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Make some changes to the wording of some of the texts
commit f5ee53e52ffb450acca5905770dc897dc1fa7759 Author: Arturo Filastò a...@fuffa.org Date: Mon Mar 16 13:24:20 2015 +0100 Make some changes to the wording of some of the texts --- informed-consent/inform-users-long.md | 22 ++ informed-consent/inform-users-short.md | 18 -- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/informed-consent/inform-users-long.md b/informed-consent/inform-users-long.md index fdfebbd..e76cfd2 100644 --- a/informed-consent/inform-users-long.md +++ b/informed-consent/inform-users-long.md @@ -1,7 +1,11 @@ # LEGALITY -OONI does several things which may be illegal in your country, and/or -banned by your ISP. +Before running OONI inside of a country with controversial internet access +related laws you should consult a lawyer. You may also reach out to us with +specific inquiries at le...@ooni.nu. + +Some things that OONI does may be against the terms of service of your ISP or +legally questionable by your country. OONI's http test will download data from controversial websites, specifically targeting those which may be censored in your country. @@ -16,8 +20,11 @@ using Tor. In the most extreme case, any form of network monitoring could be illegal or banned, or even considered a form of espionage. -[Include link to some resource on relevant laws globally. Someone like -the EFF must have one of these; does anybody have a link?] +Some useful resources may be: + +* [Tor Legal FAQ](https://www.eff.org/torchallenge/faq.html) + +* [EFF Know Your Rights](https://www.eff.org/issues/know-your-rights) # PRIVACY @@ -37,11 +44,10 @@ content based on your network location. You can see what information OONI releases to the public at https://ooni.torproject.org/reports/. You should expect this information -to remain online PERMANENTLY. [include details of retention policy, once -we have one] +to remain online PERMANENTLY. -THE OONI PROJECT will also be able to see your IP address [What other -info do we get?] +THE OONI PROJECT when running some tests against our backends will be able to +see your IP address. ORGANIZATIONS MONITORING YOUR INTERNET CONNECTION will be able to see all web traffic generated by OONI, including your IP address, and will diff --git a/informed-consent/inform-users-short.md b/informed-consent/inform-users-short.md index 0422d5a..1a6ac0c 100644 --- a/informed-consent/inform-users-short.md +++ b/informed-consent/inform-users-short.md @@ -1,10 +1,8 @@ -WARNING: Running OONI may be illegal in your country, or forbidden by -your ISP. By running OONI you will connect to web services which may be -banned, and use web censorship circumvention methods such as Tor. The -OONI project will publish data submitted by probes, possibly including -your IP address or other identifying information. In addition, your use -of OONI will be clear to anybody who has access to your computer, and to -anybody who can monitor your internet connection (such as your employer, -ISP or government). - -[link to long version] +WARNING: Running OONI may be against the terms of service of your ISP +or legally questionable in your country. +By running OONI you will connect to web services which may be banned, and use +web censorship circumvention methods such as Tor. The OONI project will publish +data submitted by probes, possibly including your IP address or other +identifying information. In addition, your use of OONI will be clear to anybody +who has access to your computer, and to anybody who can monitor your internet +connection (such as your employer, ISP or government). ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Merge pull request #31 from kudrom/feature/updated_oonib_policy_aware
commit 4525ff6ba4fa9f7f264a7dd46955dc26c36d78c0 Merge: abd539e 197063b Author: Arturo Filastò art...@filasto.net Date: Mon Sep 1 12:32:18 2014 +0200 Merge pull request #31 from kudrom/feature/updated_oonib_policy_aware Review of policy aware changes oonib.md | 70 ++ 1 file changed, 66 insertions(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Merge pull request #33 from TheTorProject/feature/dns_injection
commit 8ee0cef1af7cb1c9cc7709936f226841be28c498 Merge: f90fd4a f536f4c Author: Arturo Filastò art...@filasto.net Date: Tue Dec 9 12:24:42 2014 +0100 Merge pull request #33 from TheTorProject/feature/dns_injection Add DNS Injection test test-specs/ts-012-dns-injection.md | 150 1 file changed, 150 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Rename meek test for naming consistency
commit 84b8d1cafa42802ef98caad3013f870db7a62a25
Author: Arturo Filastò a...@fuffa.org
Date: Wed Apr 15 19:09:54 2015 +0200
Rename meek test for naming consistency
---
test-specs/ts-013-meek-fronted-requests.md | 111
test-specs/ts-013-meek_fronted_requests.md | 111
2 files changed, 111 insertions(+), 111 deletions(-)
diff --git a/test-specs/ts-013-meek-fronted-requests.md
b/test-specs/ts-013-meek-fronted-requests.md
new file mode 100644
index 000..f78066e
--- /dev/null
+++ b/test-specs/ts-013-meek-fronted-requests.md
@@ -0,0 +1,111 @@
+# Specification version number
+
+2015-04-01-000
+
+# Specification name
+
+Meek Fronted Request Test
+
+# Test preconditions
+
+* An internet connection
+
+# Expected impact
+
+Ability to detect uncensored fronted domains that can transmit requests to the
+inside meek-server via an intermediary web service.
+
+# Expected inputs
+
+## Import document or import data format
+
+A list of domain names (fronted domains) and host headers (meek-server) of the
+intermediary web service.
+
+## Semantics
+
+The input document may contain a domain name and a host header combination per
+line separated by colon in the format:
+
+ DomainName:HostHeader
+
+Example:
+
+ www.google.com:meek-reflect.appspot.com
+ a0.awsstatic.com:d2zfqthxsdq309.cloudfront.net
+
+# Test description
+
+Performs a HTTP GET request over TLS (HTTPS) to a list of fronted domains with
+the Host Header of the inside meek-server. For diagnostic purposes the
+meek-server handles a GET request and respond with: Iâm just a happy little
+web server.\n. The GET request is sent over TLS to the root of the fronted
+domain with the Host Header option of the desired meek-server host.
+
+
+# Expected output
+
+## Parent data format
+
+df-001-httpt-000
+
+## Required output data
+
+* The domain name and host header used in the measurement
+ (DomainName:HostHeader)
+
+* The requests that have been made
+
+* The received responses
+
+* If the meek server is blocked or unreachable
+
+## Semantics
+
+success:
+ **boolean** indicates if an HTTPS GET response to the meek server is
+ successfull
+
+## Possible conclusions
+
+If the fronted request/response to the meek server is successful.
+
+## Example output sample
+
+```
+agent: agent
+input: ajax.aspnetcdn.com:az668014.vo.msecnd.net
+requests:
+- request:
+body: null
+headers:
+- - Host
+ - [az668014.vo.msecnd.net]
+method: GET
+tor: {is_tor: false}
+url: https://ajax.aspnetcdn.com
+ response:
+body: I\u2019m just a happy little web server.\n
+code: 200
+headers:
+- - Content-Length
+ - ['38']
+- - X-Cache
+ - [HIT]
+- - X-Powered-By
+ - [ASP.NET]
+- - Accept-Ranges
+ - [bytes]
+- - Server
+ - [ECAcc (fcn/40C4)]
+- - Last-Modified
+ - ['Wed, 01 Apr 2015 09:25:13 GMT']
+- - Connection
+ - [close]
+- - Date
+ - ['Wed, 01 Apr 2015 10:01:37 GMT']
+- - Content-Type
+ - [text/plain; charset=utf-8]
+socksproxy: null
+success: true
+```
diff --git a/test-specs/ts-013-meek_fronted_requests.md
b/test-specs/ts-013-meek_fronted_requests.md
deleted file mode 100644
index f78066e..000
--- a/test-specs/ts-013-meek_fronted_requests.md
+++ /dev/null
@@ -1,111 +0,0 @@
-# Specification version number
-
-2015-04-01-000
-
-# Specification name
-
-Meek Fronted Request Test
-
-# Test preconditions
-
-* An internet connection
-
-# Expected impact
-
-Ability to detect uncensored fronted domains that can transmit requests to the
-inside meek-server via an intermediary web service.
-
-# Expected inputs
-
-## Import document or import data format
-
-A list of domain names (fronted domains) and host headers (meek-server) of the
-intermediary web service.
-
-## Semantics
-
-The input document may contain a domain name and a host header combination per
-line separated by colon in the format:
-
- DomainName:HostHeader
-
-Example:
-
- www.google.com:meek-reflect.appspot.com
- a0.awsstatic.com:d2zfqthxsdq309.cloudfront.net
-
-# Test description
-
-Performs a HTTP GET request over TLS (HTTPS) to a list of fronted domains with
-the Host Header of the inside meek-server. For diagnostic purposes the
-meek-server handles a GET request and respond with: Iâm just a happy little
-web server.\n. The GET request is sent over TLS to the root of the fronted
-domain with the Host Header option of the desired meek-server host.
-
-
-# Expected output
-
-## Parent data format
-
-df-001-httpt-000
-
-## Required output data
-
-* The domain name and host header used in the measurement
- (DomainName:HostHeader)
-
-* The requests that have been made
-
-* The received responses
-
-* If the meek server is blocked or unreachable
-
-## Semantics
-
-success:
- **boolean** indicates if an HTTPS GET response to the meek server is
- successfull
-
-## Possible
[tor-commits] [spec/master] Remove not used test_method
commit f90fd4a2965177431264b4c441de7d872e4381c7 Author: Arturo Filastò a...@fuffa.org Date: Fri Oct 17 11:05:40 2014 +0200 Remove not used test_method --- data-formats/df-000-base.md |4 1 file changed, 4 deletions(-) diff --git a/data-formats/df-000-base.md b/data-formats/df-000-base.md index 812edf0..8ca41c8 100644 --- a/data-formats/df-000-base.md +++ b/data-formats/df-000-base.md @@ -108,10 +108,6 @@ input: The item we this specific test instance is referring to. null in case no input is being iterated over. -test_method: - `string` the name of the test method this test is referring to (that is the - class method of a NetTestCase) - test_runtime: `float` the runtime of the test ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Merge pull request #32 from irl/master
commit b0591bd0fc64c2029e38d16ecba940e8f6b15965 Merge: 8ee0cef d04ab04 Author: Arturo Filastò art...@filasto.net Date: Thu Dec 11 23:26:06 2014 +0100 Merge pull request #32 from irl/master Initial import of raw TCP and UDP echo helpers test-helpers/th-004-raw-tcp-echo.md | 67 +++ test-helpers/th-005-raw-udp-echo.md | 54 2 files changed, 121 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Improved RESTfulness of the bouncer API.
commit 197063b7afca942374f6c0ae3c4f66995cb285ff
Author: kudrom kud...@riseup.net
Date: Fri Aug 29 15:59:49 2014 +0200
Improved RESTfulness of the bouncer API.
---
oonib.md | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/oonib.md b/oonib.md
index 81d83a3..e653b02 100644
--- a/oonib.md
+++ b/oonib.md
@@ -575,6 +575,8 @@ This will return a list of required collectors.
Currently a client has two ways to request the required collectors.
+ POST /bouncer/test-helpers
+
The first and old way is to provide a bunch of test-helpers, oonib then will
return the identity of
the collectors and the addresses of machines that can run the requested test
helpers.
@@ -615,6 +617,8 @@ helpers an error message is returned:
{'error': 'test-helper-not-found'}
```
+ POST /bouncer/net-tests
+
The second and policy respectful way is to provide a bunch of nettests, then
the bouncer
will return the identity of the machines that:
1. Can run the required test-helpers
@@ -669,9 +673,3 @@ If it's not possible to find a collector for the request,
oonib will respond wit
```
{'error': 'collector-not-found'}
```
-
-Both ways to communicate with the bouncer are explicitly set with the proper
JSON object in the
-payload of the POST request. If an invalid JSON object is provided, oonib will
respond with:
-```
-{'error': 'test-helpers-or-net-test-key-missing'}
-```
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Review of policy aware changes
commit 65c049b0217493193477ee2545f2b7a47f8e01f1
Author: kudrom kud...@riseup.net
Date: Mon Aug 25 23:32:58 2014 +0200
Review of policy aware changes
---
oonib.md | 72 ++
1 file changed, 68 insertions(+), 4 deletions(-)
diff --git a/oonib.md b/oonib.md
index 7f31b78..81d83a3 100644
--- a/oonib.md
+++ b/oonib.md
@@ -571,10 +571,14 @@ This is the service that will allow the ooni-probe to
discover collectors that r
### POST /bouncer
-This will return a list of required collectors and test helpers.
+This will return a list of required collectors.
-Client sends:
+Currently a client has two ways to request the required collectors.
+The first and old way is to provide a bunch of test-helpers, oonib then will
return the identity of
+the collectors and the addresses of machines that can run the requested test
helpers.
+
+This way, the client sends:
```
{
'test-helpers': [
@@ -583,7 +587,7 @@ Client sends:
}
```
-Bouncer replies:
+And the bouncer replies:
```
{
@@ -607,7 +611,67 @@ Bouncer replies:
If it is not possible to find a test helper for one of the required test
helpers an error message is returned:
-
```
{'error': 'test-helper-not-found'}
```
+
+The second and policy respectful way is to provide a bunch of nettests, then
the bouncer
+will return the identity of the machines that:
+ 1. Can run the required test-helpers
+ 2. Can send back to the client a set of required inputs
+ 3. Can collect the report of the nettest
+
+If a known collector to the bouncer cannot provide any of the three previous
requirements,
+the collector won't be sent back to the client in the bouncer request.
+
+If no policy respectful collector can be returned to the client, a default one
will be sent
+when the bouncer knows the identity of a collector that accepts any request,
which is
+expressed as a lack of any policy for that collector in the oonib.conf file.
+
+Both the test-helpers and the input-hashed attributes are optional for the
client's request,
+but the nettest's name is mandatory.
+
+This way the client sends:
+```
+{
+'net-tests': [
+{
+'test-helpers': ['required test helper', ...],
+'input-hashed': ['required input id', ...],
+'name': 'name of nettest',
+'version': 'version of nettest'
+},
+
+]
+}
+```
+
+And the bouncer replies:
+```
+{
+'net-tests': [
+{
+'test-helpers': [
+{'requested test helper': 'address'},
+...
+],
+'input-hashed': ['requested input id', ...],
+'name': 'name of nettest',
+'version': 'version of nettest',
+'collector': 'address'
+},
+
+]
+}
+```
+
+If it's not possible to find a collector for the request, oonib will respond
with:
+```
+{'error': 'collector-not-found'}
+```
+
+Both ways to communicate with the bouncer are explicitly set with the proper
JSON object in the
+payload of the POST request. If an invalid JSON object is provided, oonib will
respond with:
+```
+{'error': 'test-helpers-or-net-test-key-missing'}
+```
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [spec/master] Update release procedure with ooniinput and ooniresources commands.
commit e651ae72392ee7edebdad5e33ea94c6b15850b5a Author: Arturo Filastò a...@fuffa.org Date: Thu Oct 9 09:34:41 2014 +0200 Update release procedure with ooniinput and ooniresources commands. --- Release-Procedure.md | 16 1 file changed, 16 insertions(+) diff --git a/Release-Procedure.md b/Release-Procedure.md index 89afb5f..f19d44c 100644 --- a/Release-Procedure.md +++ b/Release-Procedure.md @@ -105,6 +105,22 @@ ooniprobe -n manipulation/http_header_field_manipulation ooniprobe -n blocking/http_requests -f httpo://ihiderha53f36lsd.onion/input/37e60e13536f6afe47a830bfb6b371b5cf65da66d7ad65137344679b24fdccd1 ``` +### Testing oonideckgen + +This command must produce a deck in the current working directory. + +``` +oonideckgen --country-code IT +``` + +### Testing ooniresource + +This command must update the resources. + +``` +ooniresources --update-geoip --update-inputs +``` + ### Testing vagrant installation To setup and test ooniprobe on a fresh ubuntu installation with ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [obfs4/master] Use a built in SOCKS 5 server instead of goptlibs.
commit a8d7134f1097bd50803da0e2a86c07524e433b51
Author: Yawning Angel yawn...@torproject.org
Date: Sun Apr 12 19:00:46 2015 +
Use a built in SOCKS 5 server instead of goptlibs.
Differences from my goptlib branch:
* Instead of exposing a net.Listener, just expose a Handshake() routine
that takes an existing net.Conn. (#14135 is irrelevant to this socks
server.
* There's an extra routine for sending back sensible errors on Dial
failure instead of General failure.
* The code is slightly cleaner (IMO).
Gotchas:
* If the goptlib pt.Args datatype or external interface changes,
args.go will need to be updated.
Tested with obfs3 and obfs4, including IPv6.
---
ChangeLog |1 +
common/socks5/args.go | 96 ++
common/socks5/args_test.go | 144 +++
common/socks5/rfc1929.go| 105 +++
common/socks5/socks5.go | 358 +
common/socks5/socks_test.go | 412 +++
obfs4proxy/obfs4proxy.go| 51 +++---
7 files changed, 1142 insertions(+), 25 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 50a2f49..6c7213c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ Changes in version 0.0.5 - UNRELEASED:
- Moved the leveled logging wrappers into common/log so they are usable
in transport implementations.
- Added a DEBUG log level.
+ - Use a bundled SOCKS 5 server instead of goptlib's SocksListener.
Changes in version 0.0.4 - 2015-02-17
- Improve the runtime performance of the obfs4 handshake tests.
diff --git a/common/socks5/args.go b/common/socks5/args.go
new file mode 100644
index 000..d9ea099
--- /dev/null
+++ b/common/socks5/args.go
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2015, Yawning Angel yawning at torproject dot org
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice,
+ *this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *this list of conditions and the following disclaimer in the documentation
+ *and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package socks5
+
+import (
+ fmt
+ git.torproject.org/pluggable-transports/goptlib.git
+)
+
+// parseClientParameters takes a client parameter string formatted according to
+// Passing PT-specific parameters to a client PT in the pluggable transport
+// specification, and returns it as a goptlib Args structure.
+//
+// This is functionally identical to the equivalently named goptlib routine.
+func parseClientParameters(argStr string) (args pt.Args, err error) {
+ args = make(pt.Args)
+ if len(argStr) == 0 {
+ return
+ }
+
+ var key string
+ var acc []byte
+ prevIsEscape := false
+ for idx, ch := range []byte(argStr) {
+ switch ch {
+ case '\\':
+ prevIsEscape = !prevIsEscape
+ if prevIsEscape {
+ continue
+ }
+ case '=':
+ if !prevIsEscape {
+ if key != {
+ break
+ }
+ if len(acc) == 0 {
+ return nil, fmt.Errorf(unexpected '='
at %d, idx)
+ }
+ key = string(acc)
+ acc = nil
+ continue
+ }
+ case ';':
+ if !prevIsEscape {
+ if key == || idx == len(argStr)-1 {
+ return nil, fmt.Errorf(unexpected ';'
at %d, idx)
+ }
+ args.Add(key,
[tor-commits] [obfs4/master] Do the release ritual for obfs4proxy-0.0.5.
commit 3540313e53fc851c833d98281fd64c8fd32effeb Author: Yawning Angel yawn...@torproject.org Date: Wed Apr 15 20:54:07 2015 + Do the release ritual for obfs4proxy-0.0.5. --- ChangeLog|2 +- obfs4proxy/obfs4proxy.go |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c7213c..3569518 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.0.5 - UNRELEASED: +Changes in version 0.0.5 - 2015-04-15: - Go vet/fmt fixes, and misc. code cleanups. Patches by mvdan. - Changed the go.net import path to the new location (golang.org/x/net). - Added limited support for detecting if the parent process crashes. diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go index 33fbce7..5d13b32 100644 --- a/obfs4proxy/obfs4proxy.go +++ b/obfs4proxy/obfs4proxy.go @@ -51,7 +51,7 @@ import ( ) const ( - obfs4proxyVersion = 0.0.4 + obfs4proxyVersion = 0.0.5 obfs4proxyLogFile = obfs4proxy.log socksAddr = 127.0.0.1:0 ) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-launcher/master] Bug 13576: Tor Launcher strips bridge from the middle of bridge lines
commit 78f505c2139341e71538e77a975f7df9f81189d0
Author: Kathy Brade br...@pearlcrescent.com
Date: Thu Mar 26 14:42:20 2015 -0400
Bug 13576: Tor Launcher strips bridge from the middle of bridge lines
Change the code that strips bridge to work on a line-by-line basis.
Do not add a bridge prefix when displaying bridge configuration lines.
To reduce user confusion, turn off word wrap for the custom bridge textbox.
Improve alignment within bridge settings UI.
Windows: Increase width of Tor Network Settings wizard slightly so it is
more likely that a bridge line with a fingerprint will fit.
Mac OS: Use a slightly smaller font within the custom bridge textbox.
---
src/chrome/content/network-settings-overlay.xul |5 ++---
src/chrome/content/network-settings.js | 13 +
src/chrome/skin/network-settings.css| 10 --
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/chrome/content/network-settings-overlay.xul
b/src/chrome/content/network-settings-overlay.xul
index 03171ec..af9ddf9 100644
--- a/src/chrome/content/network-settings-overlay.xul
+++ b/src/chrome/content/network-settings-overlay.xul
@@ -79,8 +79,7 @@
oncommand=onBridgeTypeRadioChange()
radio id=bridgeRadioDefault
label=torsettings.useBridges.default; selected=true /
-hbox align=baseline style=margin-top: -5px
- spacer style=width: 1.9em /
+hbox id=bridgeDefaultEntry align=baseline style=margin-top:
-5px
label id=defaultBridgeTypeLabel
value=torsettings.useBridges.type;
control=defaultBridgeType/
@@ -99,7 +98,7 @@
vbox id=bridgeCustomEntry
label id=bridgeListLabel style=margin-top:0px;
value=torsettings.useBridges.label; control=bridgeList/
- textbox id=bridgeList multiline=true rows=3
+ textbox id=bridgeList multiline=true rows=3 wrap=off
oninput=onCustomBridgesTextInput();
placeholder=torsettings.useBridges.placeholder; /
/vbox
diff --git a/src/chrome/content/network-settings.js
b/src/chrome/content/network-settings.js
index 3277553..e4ebeaa 100644
--- a/src/chrome/content/network-settings.js
+++ b/src/chrome/content/network-settings.js
@@ -69,6 +69,8 @@ function initDialog()
var isWindows = TorLauncherUtil.isWindows;
if (isWindows)
document.documentElement.setAttribute(class, os-windows);
+ else if (TorLauncherUtil.isMac)
+document.documentElement.setAttribute(class, os-mac);
var forAssistance = document.getElementById(forAssistance);
if (forAssistance)
@@ -1305,7 +1307,6 @@ function parseAndValidateBridges(aStr)
return null;
var resultStr = aStr;
- resultStr = resultStr.replace(/bridge/gi, ); // Remove bridge everywhere.
resultStr = resultStr.replace(/\r\n/g, \n); // Convert \r\n pairs into \n.
resultStr = resultStr.replace(/\r/g, \n);// Convert \r into \n.
resultStr = resultStr.replace(/\n\n/g, \n); // Condense blank lines.
@@ -1314,7 +1315,8 @@ function parseAndValidateBridges(aStr)
var tmpArray = resultStr.split('\n');
for (var i = 0; i tmpArray.length; i++)
{
-let s = tmpArray[i].trim(); // Remove extraneous whitespace.
+let s = tmpArray[i].trim(); // Remove extraneous white space.
+s = s.replace(/^bridge\s+/i, ); // Remove bridge from start of line.
resultArray.push(s);
}
@@ -1397,8 +1399,7 @@ function setElemValue(aID, aValue)
// Returns true if one or more values were set.
function setBridgeListElemValue(aBridgeArray)
{
- // To be consistent with bridges.torproject.org, pre-pend bridge to
- // each line as it is displayed in the UI.
+ // Trim white space and only keep non-empty values.
var bridgeList = [];
if (aBridgeArray)
{
@@ -1406,11 +1407,7 @@ function setBridgeListElemValue(aBridgeArray)
{
var s = aBridgeArray[i].trim();
if (s.length 0)
- {
-if (s.toLowerCase().indexOf(bridge) != 0)
- s = bridge + s;
bridgeList.push(s);
- }
}
}
diff --git a/src/chrome/skin/network-settings.css
b/src/chrome/skin/network-settings.css
index 331ae42..646baa6 100644
--- a/src/chrome/skin/network-settings.css
+++ b/src/chrome/skin/network-settings.css
@@ -24,7 +24,7 @@ wizard {
}
wizard.os-windows {
- width: 46em;
+ width: 49em;
height: 41em;
}
@@ -99,8 +99,14 @@ wizard[tor_hide_browser_logo=true] .tbb-logo-separator {
display: none;
}
+#bridgeDefaultEntry,
#bridgeCustomEntry {
- margin-left: 30px;
+ margin-left: 1.8em;
+}
+
+dialog.os-mac #bridgeList,
+wizard.os-mac #bridgeList {
+ font-size: 90%;
}
wizardpage[pageid=startingTor] description,
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-launcher/master] Merge branch 'bug13576-01'
commit a37371ac9a866612e91a791251104184caad41ca Merge: b48d563 78f505c Author: Georg Koppen g...@torproject.org Date: Wed Apr 15 20:01:36 2015 + Merge branch 'bug13576-01' src/chrome/content/network-settings-overlay.xul |5 ++--- src/chrome/content/network-settings.js | 13 + src/chrome/skin/network-settings.css| 10 -- 3 files changed, 15 insertions(+), 13 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor_animation] Update translations for tor_animation
commit 85dba5fa12f16ebee63b230eee316b4db8a93fd5 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 19:15:55 2015 + Update translations for tor_animation --- id.srt | 92 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/id.srt b/id.srt index 78c998d..03dde19 100644 --- a/id.srt +++ b/id.srt @@ -1,126 +1,126 @@ 1 00:00:00,660 -- 00:00:02,780 -We've gotten very used to the Internet. +Kita sudah terbiasa dengan internet 2 00:00:03,120 -- 00:00:07,700 -We are constantly sharing information -about ourselves and our private lives: +Kita selalu membagi informasi +mengenai kita dan kehidupan pribadi kita: 3 00:00:08,000 -- 00:00:09,960 -food we eat, people we meet, +makanan yg kita makan, orang2 yang kita temui, 4 00:00:10,180 -- 00:00:12,480 -places we go, and the stuff we read. +tempat kita berada, dan sesuatu yang kita baca. 5 00:00:13,280 -- 00:00:14,640 -Let me explain it better. +Akan saya jelaskan lebih lanjut. 6 00:00:14,920 -- 00:00:17,740 -Right at this moment, -if someone attempts to look you up, +Pada saat ini, +jika seseorang mencoba untuk mencari anda, 7 00:00:18,060 -- 00:00:22,480 -they'll see your real identity, -precise location, operating system, +mereka akan melihat identitas asli anda, +lokasi, system operasi, 8 00:00:22,800 -- 00:00:26,500 -all the sites you've visited, -the browser you use to surf the web, +semua halaman web yang sudah anda kunjungi, +applikasi yang anda pakai untuk menjelajahi internet, 9 00:00:26,700 -- 00:00:29,140 -and so much more information -about you and your life +dan begitu banyak informasi +mengenai anda dan hidup anda 10 00:00:29,620 -- 00:00:32,460 -which you probably didn't mean -to share with unknown strangers, +yang mungkin anda tidak bermaksud +untuk dibagi ke orang asing, 11 00:00:32,920 -- 00:00:35,840 -who could easily use this data -to exploit you. +yang bisa dengan mudah menggunakan data2 itu +untuk memanfaatkan anda 12 00:00:36,220 -- 00:00:38,120 -But not if you're using Tor! +Tapi tidak bila anda menggunakan Tor! 13 00:00:39,140 -- 00:00:42,840 -Tor Browser protects our privacy -and identity on the Internet. +Tor Browser melindungi rahasia +dan identitas kita di internet. 14 00:00:43,560 -- 00:00:46,760 -Tor secures your connection -with three layers of encryption +Tor mengamankan koneksi anda +dengan 3 lapis pengamanan 15 00:00:46,940 -- 00:00:51,760 -and passes it through three voluntarily -operated servers around the world, +dan melewatkannya melalui 3 +server yang beroperasi bebas di seluruh dunia 16 00:00:52,280 -- 00:00:55,520 -which enables us to communicate -anonymously over the Internet. +yang mana membantu kita untuk berkomunikasi +tanpa menunjukkan identitas kita di internet. 17 00:00:58,560 -- 00:01:00,280 -Tor also protects our data +Tor juga melindungi data kita 18 00:01:00,400 -- 00:01:03,900 -against corporate or government targeted -and mass surveillance. +dari intaian perusahaan besar atau pemerintah +dan pengawasan massa. 19 00:01:04,880 -- 00:01:09,340 -Perhaps you live in a repressive country -which tries to control and surveil the Internet. +Mungkin anda hidup di negara yg terkekang +yg mencoba untuk mengontrol dan mengawasi internet. 20 00:01:09,900 -- 00:01:13,800 -Or perhaps you don't want big corporations -taking advantage of your personal information. +Atau mungkin anda tidak menginginkan perusahaan besar +mengambil keuntungan dari informasi pribadi anda. 21 00:01:14,880 -- 00:01:17,640 -Tor makes all of its users -to look the same +Tor membuat semua penggunanya +terlihat sama 22 00:01:17,920 -- 00:01:20,800 -which confuses the observer -and makes you anonymous. +yang akan membuat bingung pengawas +and membuat anda tidak terlihat. 23 00:01:21,500 -- 00:01:24,980 -So, the more people use the Tor network, -the stronger it gets +Jadi, lebih banyak orang yg memakai jaringan Tor, +akan membuat jaringannya lebih kuat 24 00:01:25,140 -- 00:01:29,800 -as it's easier to hide in a crowd -of people who look exactly the same. +dan akan membuat lebih mudah untuk bersembunyi di kerumunan +pengguna yang tampak sama persis. 25 00:01:30,700 -- 00:01:33,240 -You can bypass the censorship -without being worried about +Anda dapat melewati sensor +tanpa harus kuatir mengenai 26 00:01:33,400 -- 00:01:36,100 -the censor knowing what you do -on the Internet. +sensornya akan mengetahui apa yang anda lakukan +di internet. 27 00:01:38,540 -- 00:01:41,440 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor_animation_completed] Update translations for tor_animation_completed
commit 102973ff9d175cada930280f5ba0ef8fd4129cd5 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 19:46:01 2015 + Update translations for tor_animation_completed --- id.srt | 164 1 file changed, 164 insertions(+) diff --git a/id.srt b/id.srt new file mode 100644 index 000..28d02b0 --- /dev/null +++ b/id.srt @@ -0,0 +1,164 @@ +1 +00:00:00,660 -- 00:00:02,780 +Kita sudah terbiasa dengan internet + +2 +00:00:03,120 -- 00:00:07,700 +Kita selalu membagi informasi +mengenai kita dan kehidupan pribadi kita: + +3 +00:00:08,000 -- 00:00:09,960 +makanan yg kita makan, orang2 yang kita temui, + +4 +00:00:10,180 -- 00:00:12,480 +tempat kita berada, dan sesuatu yang kita baca. + +5 +00:00:13,280 -- 00:00:14,640 +Akan saya jelaskan lebih lanjut. + +6 +00:00:14,920 -- 00:00:17,740 +Pada saat ini, +jika seseorang mencoba untuk mencari anda, + +7 +00:00:18,060 -- 00:00:22,480 +mereka akan melihat identitas asli anda, +lokasi, system operasi, + +8 +00:00:22,800 -- 00:00:26,500 +semua halaman web yang sudah anda kunjungi, +applikasi yang anda pakai untuk menjelajahi internet, + +9 +00:00:26,700 -- 00:00:29,140 +dan begitu banyak informasi +mengenai anda dan hidup anda + +10 +00:00:29,620 -- 00:00:32,460 +yang mungkin anda tidak bermaksud +untuk dibagi ke orang asing, + +11 +00:00:32,920 -- 00:00:35,840 +yang bisa dengan mudah menggunakan data2 itu +untuk memanfaatkan anda + +12 +00:00:36,220 -- 00:00:38,120 +Tapi tidak bila anda menggunakan Tor! + +13 +00:00:39,140 -- 00:00:42,840 +Tor Browser melindungi rahasia +dan identitas kita di internet. + +14 +00:00:43,560 -- 00:00:46,760 +Tor mengamankan koneksi anda +dengan 3 lapis pengamanan + +15 +00:00:46,940 -- 00:00:51,760 +dan melewatkannya melalui 3 +server yang beroperasi bebas di seluruh dunia + +16 +00:00:52,280 -- 00:00:55,520 +yang mana membantu kita untuk berkomunikasi +tanpa menunjukkan identitas kita di internet. + +17 +00:00:58,560 -- 00:01:00,280 +Tor juga melindungi data kita + +18 +00:01:00,400 -- 00:01:03,900 +dari intaian perusahaan besar atau pemerintah +dan pengawasan massa. + +19 +00:01:04,880 -- 00:01:09,340 +Mungkin anda hidup di negara yg terkekang +yg mencoba untuk mengontrol dan mengawasi internet. + +20 +00:01:09,900 -- 00:01:13,800 +Atau mungkin anda tidak menginginkan perusahaan besar +mengambil keuntungan dari informasi pribadi anda. + +21 +00:01:14,880 -- 00:01:17,640 +Tor membuat semua penggunanya +terlihat sama + +22 +00:01:17,920 -- 00:01:20,800 +yang akan membuat bingung pengawas +and membuat anda tidak terlihat. + +23 +00:01:21,500 -- 00:01:24,980 +Jadi, lebih banyak orang yg memakai jaringan Tor, +akan membuat jaringannya lebih kuat + +24 +00:01:25,140 -- 00:01:29,800 +dan akan membuat lebih mudah untuk bersembunyi di kerumunan +pengguna yang tampak sama persis. + +25 +00:01:30,700 -- 00:01:33,240 +Anda dapat melewati sensor +tanpa harus kuatir mengenai + +26 +00:01:33,400 -- 00:01:36,100 +sensornya akan mengetahui apa yang anda lakukan +di internet. + +27 +00:01:38,540 -- 00:01:41,440 +Iklan-iklannya tidak akan mengikuti anda +kemana-mana selama berbulan-bulan, + +28 +00:01:41,640 -- 00:01:43,300 +mulai dari pertama anda +menekan gambar suatu barang. + +29 +00:01:45,880 -- 00:01:49,380 +Dengan menggunakan Tor, situs-situs yang anda kunjungi +tidak akan tahu mengenai anda, + +30 +00:01:49,540 -- 00:01:51,760 +dari bagian dunia mana anda mengunjungi situs mereka. + +31 +00:01:51,920 -- 00:01:53,920 +kecuali anda memasukkan user dan password anda. + +32 +00:01:56,200 -- 00:01:57,840 +Dengan mengunduh dan menggunakan Tor, + +33 +00:01:58,200 -- 00:02:00,560 +anda dapat melindungi orang-orang +yang memerlukan privasi, + +34 +00:02:00,880 -- 00:02:03,640 +seperti aktivists, journalists dan blogger. + +35 +00:02:04,000 -- 00:02:09,000 +Unduh dan gunakan Tor! Atau gunakan relay! + ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor_animation] Update translations for tor_animation
commit ac598de11234d40a3aa3d39e650b3774cc1dc093 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 19:45:58 2015 + Update translations for tor_animation --- id.srt | 27 +-- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/id.srt b/id.srt index 03dde19..28d02b0 100644 --- a/id.srt +++ b/id.srt @@ -124,42 +124,41 @@ di internet. 27 00:01:38,540 -- 00:01:41,440 -The ads won't follow you -everywhere for months, +Iklan-iklannya tidak akan mengikuti anda +kemana-mana selama berbulan-bulan, 28 00:01:41,640 -- 00:01:43,300 -starting when you first -clicked on a product. +mulai dari pertama anda +menekan gambar suatu barang. 29 00:01:45,880 -- 00:01:49,380 -By using Tor, the sites you visit -won't even know who you are, +Dengan menggunakan Tor, situs-situs yang anda kunjungi +tidak akan tahu mengenai anda, 30 00:01:49,540 -- 00:01:51,760 -from what part of the world -you're visiting them, +dari bagian dunia mana anda mengunjungi situs mereka. 31 00:01:51,920 -- 00:01:53,920 -unless you login and tell them so. +kecuali anda memasukkan user dan password anda. 32 00:01:56,200 -- 00:01:57,840 -By downloading and using Tor, +Dengan mengunduh dan menggunakan Tor, 33 00:01:58,200 -- 00:02:00,560 -you can protect the people -who need anonymity, +anda dapat melindungi orang-orang +yang memerlukan privasi, 34 00:02:00,880 -- 00:02:03,640 -like activists, journalists and bloggers. +seperti aktivists, journalists dan blogger. 35 00:02:04,000 -- 00:02:09,000 -Download and use Tor! Or run a relay! +Unduh dan gunakan Tor! Atau gunakan relay! ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
commit c366416819657709a55181d559b54b7edb1f0c1f Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 19:45:33 2015 + Update translations for tor-launcher-network-settings --- id/network-settings.dtd |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/id/network-settings.dtd b/id/network-settings.dtd index 428626b..2033052 100644 --- a/id/network-settings.dtd +++ b/id/network-settings.dtd @@ -30,7 +30,7 @@ !ENTITY torsettings.optional Opsional -!ENTITY torsettings.useProxy.checkbox This computer needs to use a local proxy to access the Internet +!ENTITY torsettings.useProxy.checkbox Komputer ini perlu menggunakan proxy lokal untuk mengakses internet !ENTITY torsettings.useProxy.type Tipe Proxy: !ENTITY torsettings.useProxy.address Alamat: !ENTITY torsettings.useProxy.address.placeholder alamat IP atau nama host @@ -54,9 +54,9 @@ !ENTITY torsettings.bridgeHelp1 Jika Anda tidak dapat terhubung ke jaringan Tor, bisa jadi Provider Layanan Internet (ISP) atau lembaga lain yang menghalangi Tor. #160; Sering kali, Anda dapat mengatasi masalah ini dengan menggunakan Tor Bridges, yang relai terdaftar yang lebih sulit untuk memblokir. !ENTITY torsettings.bridgeHelp1B Anda dapat menggunakan prekonfigurasi, disediakan alamat set bridge atau Anda mungkin mendapatkan satu set kebiasaan alamat dengan menggunakan salah satu dari tiga metode ini: !ENTITY torsettings.bridgeHelp2Heading Lewat web -!ENTITY torsettings.bridgeHelp2 Use a web browser to visit https://bridges.torproject.org; -!ENTITY torsettings.bridgeHelp3Heading Through the Email Autoresponder +!ENTITY torsettings.bridgeHelp2 Menggunakan applikasi penjelajah interet untuk mengunjungi https://bridges.torproject.org; +!ENTITY torsettings.bridgeHelp3Heading Melalui Email Autoresponder !ENTITY torsettings.bridgeHelp3.emailDesc Send email to brid...@torproject.org with the line 'get bridges' by itself in the body of the message.#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from one of the following email providers (listed in order of preference): !ENTITY torsettings.bridgeHelp3.emailList https://www.riseup.net, https://mail.google.com, atau https://mail.yahoo.com; -!ENTITY torsettings.bridgeHelp4Heading Through the Help Desk +!ENTITY torsettings.bridgeHelp4Heading Melalui Help Desk !ENTITY torsettings.bridgeHelp4 As a last resort, you can request bridge addresses by sending a polite email message to h...@rt.torproject.org.#160; Please note that a person will need to respond to each request. ___ 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.6.0esr-4.5-1] fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers.
commit 44cd9b47cb74544aa6eac4b1b0f3d4474457c3dc
Author: Georg Koppen g...@torproject.org
Date: Tue Apr 14 10:27:02 2015 +
fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to
SOCKS servers.
---
netwerk/protocol/http/nsHttpConnectionInfo.cpp |5 +
1 file changed, 5 insertions(+)
diff --git a/netwerk/protocol/http/nsHttpConnectionInfo.cpp
b/netwerk/protocol/http/nsHttpConnectionInfo.cpp
index 2ef09b6..c602902 100644
--- a/netwerk/protocol/http/nsHttpConnectionInfo.cpp
+++ b/netwerk/protocol/http/nsHttpConnectionInfo.cpp
@@ -98,6 +98,11 @@ nsHttpConnectionInfo::SetOriginServer(const nsACString
host, int32_t port)
// information so that a change in proxy config will mean this connection
// is not reused
+// NOTE: Adding the username and the password provides a means to isolate
+// keep-alive to the URL bar domain as well: If the username is the URL bar
+// domain, keep-alive connections are not reused by resources bound to
+// different URL bar domains as the respective hash keys are not matching.
+
if ((!mUsingHttpProxy ProxyHost()) ||
(mUsingHttpProxy mUsingConnect)) {
mHashKey.AppendLiteral( ();
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [bridgedb/develop] Merge branch 'fix/12505-5418-remove-old-block-code' into develop
commit 91f4cf9c084765748fed80f8f8d00eae80c5e68e Merge: 7a1a54f 5e032ef Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 1 06:13:21 2015 + Merge branch 'fix/12505-5418-remove-old-block-code' into develop lib/bridgedb/Bridges.py | 72 - lib/bridgedb/Bucket.py|8 - lib/bridgedb/Main.py | 20 --- lib/bridgedb/Storage.py | 46 lib/bridgedb/test/legacy_Tests.py | 40 + 5 files changed, 1 insertion(+), 185 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [bridgedb/develop] Improve documentation for b.bridgerequest.BridgeRequestBase attributes.
commit 33656cd687eb74874eb52ed28a65b7704fd78262 Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 1 05:51:17 2015 + Improve documentation for b.bridgerequest.BridgeRequestBase attributes. --- lib/bridgedb/bridgerequest.py | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/bridgerequest.py b/lib/bridgedb/bridgerequest.py index ff8e289..f653450 100644 --- a/lib/bridgedb/bridgerequest.py +++ b/lib/bridgedb/bridgerequest.py @@ -33,8 +33,8 @@ class IRequestBridges(Interface): transports = Attribute( A list of strings of Pluggable Transport types requested.) notBlockedIn = Attribute( -A list of 2-4 letter country codes. The distributed bridges should -not be blocked in these countries.) +A list of two-character country codes. The distributed bridges +should not be blocked in these countries.) valid = Attribute( A boolean. Should be ``True`` if the client's request was valid.) client = Attribute( @@ -87,12 +87,18 @@ class BridgeRequestBase(object): implements(IRequestBridges) def __init__(self, addressClass=None): +#: (:class:`ipaddr.IPv4Address` or :class:`ipaddr.IPv6Address`) The IP +#: version of bridge addresses to distribute to the client. self.addressClass = addressClass if not ((self.addressClass is ipaddr.IPv4Address) or (self.addressClass is ipaddr.IPv6Address)): self.addressClass = ipaddr.IPv4Address +#: (list) A list of callables used to filter bridges from a hashring. self.filters = list() +#: (list) A list of strings of Pluggable Transport types requested. self.transports = list() +#: (list) A list of two-character country codes. The distributed bridges +#: should not be blocked in these countries. self.notBlockedIn = list() #: This should be some information unique to the client making the #: request for bridges, such that we are able to HMAC this unique data @@ -100,6 +106,7 @@ class BridgeRequestBase(object): #: bridge addresses they get in the request response). It defaults to #: the string ``'default'``. self.client = 'default' +#: (bool) Should be ``True`` if the client's request was valid. self.valid = False def getHashringPlacement(self, key, client=None): ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [bridgedb/develop] Remove all remnants of #5027/#5418 bridge block parser code.
commit 5e032efa39a4c00f00ca2f86460f952bf2c081a8
Author: Isis Lovecruft i...@torproject.org
Date: Wed Apr 1 01:04:33 2015 +
Remove all remnants of #5027/#5418 bridge block parser code.
* REMOVES bridgedb.Bridges.re_ipv4.
* REMOVES bridgedb.Bridges.re_ipv6.
* REMOVES bridgedb.Bridges.parseCountryBlockFile().
* REMOVES bridgedb.Bridges.BridgeBlock.
* REMOVES bridgedb.Bridges.CountryBlock.
* REMOVES bridgedb.Storage.Database.addBridgeBlock().
* REMOVES bridgedb.Storage.Database.delBridgeBlock().
* REMOVES bridgedb.Storage.Database.cleanBridgeBlocks().
* REMOVES bridgedb.Storage.Database.getBlockingCountries().
* REMOVES bridgedb.Storage.Database.getBlockedBridges().
* REMOVES bridgedb.Storage.Database.isBlocked().
* REMOVES several asserts for the above b.Storage.Database methods from
bridgedb.test.legacy_Tests.SQLStorageTests.
* REMOVES bridgedb.test.legacy_Tests.ParseCountryBlockFileTests.
* FIXES #5418: https://bugs.torproject.org/5418
* SEEALSO #5027: https://bugs.torproject.org/5027
* FIXES part of #12505: https://bugs.torproject.org/12505
---
lib/bridgedb/Bridges.py | 72 -
lib/bridgedb/Bucket.py|8 -
lib/bridgedb/Main.py | 20 ---
lib/bridgedb/Storage.py | 46
lib/bridgedb/test/legacy_Tests.py | 40 +
5 files changed, 1 insertion(+), 185 deletions(-)
diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py
index 078cfff..0239730 100644
--- a/lib/bridgedb/Bridges.py
+++ b/lib/bridgedb/Bridges.py
@@ -40,41 +40,6 @@ ID_LEN = 20 # XXX Only used in commented out line in
Storage.py
DIGEST_LEN = 20
PORTSPEC_LEN = 16
-re_ipv6 = re.compile(\[([a-fA-F0-9:]+)\]:(.*$))
-re_ipv4 = re.compile(((?:\d{1,3}\.?){4}):(.*$))
-
-
-def parseCountryBlockFile(f):
-Generator. Parses a blocked-bridges file 'f', and yields
- a fingerprint (ID), address, a list of ports, and a list of country
- codes where the bridge is blocked for each valid line:
- address, port [], countrycode []
-for line in f:
-ID = address = fields = portlist = countries = None
-line = line.strip()
-try:
-ID, addrspec, countries = line.split()
-if isValidFingerprint(ID):
-ID = fromHex(ID)
-logging.debug(Parsed ID: %s, ID)
-else:
-print failed to parse ID!
-continue # skip this line
-
-for regex in [re_ipv4, re_ipv6]:
-m = regex.match(addrspec)
-if m:
-address = ipaddr.IPAddress(m.group(1))
-portlist = addr.PortList(m.group(2))
-countries = countries.split(',')
-logging.debug(Parsed address: %s, address)
-logging.debug(Parsed portlist: %s, portlist)
-logging.debug(Parsed countries: %s, countries)
-except (IndexError, ValueError):
-logging.debug(Skipping line)
-continue # skip this line
-if ID and address and portlist and countries:
-yield ID, address, portlist, countries
class BridgeHolder(object):
Abstract base class for all classes that hold bridges.
@@ -751,40 +716,3 @@ class FilteredBridgeSplitter(BridgeHolder):
desc = %s %s % (description.strip(),
.join([v for k,v in grouped.items()]).strip())
f.write(%s %s\n%( toHex(b.getID()), desc))
-
-class BridgeBlock(object):
-Base class that abstracts bridge blocking.
-
-.. TODO:: This should be a zope.interface specification.
-
-def __init__(self):
-pass
-
-def insert(self, fingerprint, blockingRule):
-raise NotImplementedError
-
-def clear(self):
-pass
-
-class CountryBlock(BridgeBlock):
-Countrywide bridge blocking
-def __init__(self):
-self.db = bridgedb.Storage.getDB()
-
-def clear(self):
-assert self.db
-self.db.cleanBridgeBlocks()
-self.db.commit()
-
-def insert(self, fingerprint, blockingRule):
- insert a country based blocking rule
-assert self.db
-countryCode = blockingRule
-self.db.addBridgeBlock(fingerprint, countryCode)
-self.db.commit()
-
-def getBlockingCountries(self, fingerprint):
- returns a list of country codes where this fingerprint is
blocked
-assert self.db
-if fingerprint is not None:
-return self.db.getBlockingCountries(fingerprint)
diff --git a/lib/bridgedb/Bucket.py b/lib/bridgedb/Bucket.py
index 5e7f61b..1382188 100644
--- a/lib/bridgedb/Bucket.py
+++ b/lib/bridgedb/Bucket.py
@@ -242,14 +242,6 @@ class BucketManager(object):
bridgeHistories.sort(lambda x,y:
cmp(x.weightedFractionalUptime,
[tor-commits] [bridgedb/develop] Fix missing random module import to bridgedb.test.util.
commit 4ff20fd52aab80958e3c3f2af0908e003d907761 Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 1 06:31:37 2015 + Fix missing random module import to bridgedb.test.util. --- lib/bridgedb/test/util.py |1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index f276dc4..234a9b6 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -17,6 +17,7 @@ from __future__ import unicode_literals import errno import ipaddr import os +import random from functools import wraps ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [bridgedb/develop] Fix documentation for `key` parameter in IPBasedDistributor.
commit a43a05802c108292f26c9bc1bc959d5cfb3b62dc Author: Isis Lovecruft i...@torproject.org Date: Tue Apr 14 07:36:28 2015 + Fix documentation for `key` parameter in IPBasedDistributor. Conflicts: lib/bridgedb/Dist.py --- lib/bridgedb/Dist.py |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py index 6bb41b9..78741a7 100644 --- a/lib/bridgedb/Dist.py +++ b/lib/bridgedb/Dist.py @@ -156,9 +156,9 @@ class IPBasedDistributor(Distributor): because the set of known open proxies constitutes its own category. DOCDOC What exactly does a cluster *do*? -:param bytearray key: The master HMAC key for this distributor. All -added bridges are HMACed with this key in order to place them into -the hashrings. +:param bytes key: The master HMAC key for this distributor. All added +bridges are HMACed with this key in order to place them into the +hashrings. :type ipCategories: iterable or None :param ipCategories: DOCDOC :type answerParameters: :class:`bridgedb.Bridges.BridgeRingParameters` ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [bridgedb/develop] PEP8 and Sphinx documentation fixes for bridgedb.geo.getCountryCode().
commit 6a3ca67a7119f0958c23298aa6b3fceeb4ad4271 Author: Isis Lovecruft i...@torproject.org Date: Thu Apr 2 21:42:18 2015 + PEP8 and Sphinx documentation fixes for bridgedb.geo.getCountryCode(). --- lib/bridgedb/geo.py | 28 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/lib/bridgedb/geo.py b/lib/bridgedb/geo.py index 3b48016..c986fa1 100644 --- a/lib/bridgedb/geo.py +++ b/lib/bridgedb/geo.py @@ -38,20 +38,25 @@ except Exception as err: # pragma: no cover geoip = None geoipv6 = None -def getCountryCode(IPAddr): + +def getCountryCode(ip): Return the two-letter country code of a given IP address. -:param IPAddr: (:class:`ipaddr.IPAddress`) An IPv4 OR IPv6 address. - +:type ip: :class:`ipaddr.IPAddress` +:param ip: An IPv4 OR IPv6 address. +:rtype: ``None`` or str -ip = None +:returns: If the GeoIP databases are loaded, and the **ip** lookup is +successful, then this returns a two-letter country code. Otherwise, +this returns ``None``. + +addr = None version = None try: -ip = IPAddr.compressed -version = IPAddr.version +addr = ip.compressed +version = ip.version except AttributeError as err: -logging.warn(Wrong type passed to getCountryCode. Offending call: - %r % err) +logging.warn(Wrong type passed to getCountryCode: %s % str(err)) return None # GeoIP has two databases: one for IPv4 addresses, and one for IPv6 @@ -59,8 +64,7 @@ def getCountryCode(IPAddr): db = None # First, make sure we loaded GeoIP properly. if None in (geoip, geoipv6): -logging.warn(GeoIP databases failed to load; could not look up\ - country code.) +logging.warn(GeoIP databases aren't loaded; can't look up country code) return None else: if version == 4: @@ -69,10 +73,10 @@ def getCountryCode(IPAddr): db = geoipv6 # Look up the country code of the address. -countryCode = db.country_code_by_addr(ip) +countryCode = db.country_code_by_addr(addr) if countryCode: logging.debug(Looked up country code: %s % countryCode) return countryCode else: -logging.debug(Country code was not detected. IP: %s % ip) +logging.debug(Country code was not detected. IP: %s % addr) return None ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [bridgedb/develop] Rewrite `python setyp.py test` code to run Trial tests only.
commit 382a4f5e54a26dc7a2179d17cb4129f68e3e650e
Author: Isis Lovecruft i...@torproject.org
Date: Thu Apr 16 04:23:24 2015 +
Rewrite `python setyp.py test` code to run Trial tests only.
---
lib/bridgedb/parse/options.py | 27 --
lib/bridgedb/runner.py| 47
setup.py | 119 +
3 files changed, 109 insertions(+), 84 deletions(-)
diff --git a/lib/bridgedb/parse/options.py b/lib/bridgedb/parse/options.py
index 2ed93d0..3979615 100644
--- a/lib/bridgedb/parse/options.py
+++ b/lib/bridgedb/parse/options.py
@@ -251,32 +251,6 @@ class BaseOptions(usage.Options):
print( self['rundir']=%s % self['rundir'])
-class TestOptions(BaseOptions):
-Suboptions for running twisted.trial and unittest based tests.
-
-longdesc = textwrap.dedent(BridgeDB testing commands.
-See the `bridgedb mock` command for generating testing environments.)
-
-optFlags = [['coverage', 'c', 'Generate coverage statistics']]
-optParameters = [
-['file', 'f', None, 'Run tests in specific file(s) (trial only)'],
-['unittests', 'u', False, 'Run unittests in bridgedb.Tests'],
-['trial', 't', True, 'Run twisted.trial tests in bridgedb.test']]
-
-completionData = usage.Completions(
-mutuallyExclusive=[('unittests', 'coverage'),
- ('unittests', 'file')],
-optActions={'file': usage.CompleteFiles('lib/bridgedb/test/test_*.py',
-repeat=True,
-descr=test filename)},
-extraActions=[
-usage.Completer(descr=extra arguments to pass to trial)])
-
-def parseArgs(self, *args):
-Parse any additional arguments after the options and flags.
-self['test_args'] = args
-
-
class MockOptions(BaseOptions):
Suboptions for creating necessary conditions for testing purposes.
@@ -315,7 +289,6 @@ class MainOptions(BaseOptions):
['dump-bridges', 'd', 'Dump bridges by hashring assignment into
files'],
['reload', 'R', 'Reload bridge descriptors into running servers']]
subCommands = [
-['test', None, TestOptions, Run twisted.trial tests or unittests],
['mock', None, MockOptions, Generate a testing environment],
['SIGHUP', None, SIGHUPOptions,
Reload bridge descriptors into running servers],
diff --git a/lib/bridgedb/runner.py b/lib/bridgedb/runner.py
index 7be7700..6ac069f 100644
--- a/lib/bridgedb/runner.py
+++ b/lib/bridgedb/runner.py
@@ -94,53 +94,6 @@ def generateDescriptors(count=None, rundir=None):
del subprocess
return statuscode
-def runTrial(options):
-Run Twisted trial based unittests, optionally with coverage.
-
-:type options: :class:`~bridgedb.opt.TestOptions`
-:param options: Parsed options for controlling the twisted.trial test
-run. All unrecognised arguments after the known options will be passed
-along to trial.
-
-from twisted.scripts import trial
-
-# Insert 'trial' as the first system cmdline argument:
-sys.argv = ['trial']
-
-if options['coverage']:
-try:
-from coverage import coverage
-except ImportError as ie:
-print(ie.message)
-else:
-cov = coverage()
-cov.start()
-sys.argv.append('--coverage')
-sys.argv.append('--reporter=bwverbose')
-
-# Pass all arguments along to its options parser:
-if 'test_args' in options:
-for arg in options['test_args']:
-sys.argv.append(arg)
-# Tell trial to test the bridgedb package:
-sys.argv.append('bridgedb.test')
-trial.run()
-
-if options['coverage']:
-cov.stop()
-cov.html_report('_trial_temp/coverage/')
-
-def runTests(options):
-Run unittest based tests.
-
-:type options: :class:`~bridgedb.opt.TestOptions`
-:param options: Parsed options for controlling the twisted.trial test
-run. All unrecognised arguments after the known options will be passed
-along to trial.
-
-testModule = __import__('bridgedb.Tests', globals(), '', [])
-testModule.Tests.main()
-
def doDumpBridges(config):
Dump bridges by assignment to a file.
diff --git a/setup.py b/setup.py
index 9402071..032aa10 100644
--- a/setup.py
+++ b/setup.py
@@ -74,6 +74,7 @@ install_i18n = os.path.join('bridgedb', 'i18n')
# Directory to install docs, license, and other text resources into:
install_docs = os.path.join('share', 'doc', 'bridgedb')
+
def get_cmdclass():
Get our cmdclass dictionary for use in setuptool.setup().
@@ -81,7 +82,7 @@ def get_cmdclass():
to add our own classes to the cmdclass dictionary, and then update that
dictionary with the one returned from versioneer.get_cmdclass().
-cmdclass = {'test': runTests,
+cmdclass = {'test': Trial,
[tor-commits] [bridgedb/develop] Print each log line from get-tor-exits to it's own line in our log.
commit 63bd41f58ca2e4fe4b008fcba12739590e3c3b2c Author: Isis Lovecruft i...@torproject.org Date: Thu Apr 2 05:08:38 2015 + Print each log line from get-tor-exits to it's own line in our log. --- lib/bridgedb/proxy.py |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/proxy.py b/lib/bridgedb/proxy.py index 7fab5af..086f3bd 100644 --- a/lib/bridgedb/proxy.py +++ b/lib/bridgedb/proxy.py @@ -406,7 +406,8 @@ class ExitListProtocol(protocol.ProcessProtocol): def errReceived(self, data): Some data was received from stderr. # The get-exit-list script uses twisted.python.log to log to stderr: -logging.debug(data) # pragma: no cover +for line in data.splitlines(): # pragma: no cover +logging.debug(line) def outReceived(self, data): Some data was received from stdout. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [bridgedb/develop] Add missing ipaddr module to bridgedb.test.util.
commit 7a1a54fdb1f980afb0c791f26dc5c4b851db32a5 Author: Isis Lovecruft i...@torproject.org Date: Wed Apr 1 06:08:55 2015 + Add missing ipaddr module to bridgedb.test.util. --- lib/bridgedb/test/util.py |1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/test/util.py b/lib/bridgedb/test/util.py index 2949eca..f276dc4 100644 --- a/lib/bridgedb/test/util.py +++ b/lib/bridgedb/test/util.py @@ -15,6 +15,7 @@ from __future__ import print_function from __future__ import unicode_literals import errno +import ipaddr import os from functools import wraps ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [bridgedb/develop] Don't log special/private attributes when logging changed configuration.
commit 584d5911df5318caeabc5b57a0b480dc10d211e9
Author: Isis Lovecruft i...@torproject.org
Date: Thu Apr 2 05:05:28 2015 +
Don't log special/private attributes when logging changed configuration.
---
lib/bridgedb/configure.py |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/bridgedb/configure.py b/lib/bridgedb/configure.py
index 8a24d35..2992e1c 100644
--- a/lib/bridgedb/configure.py
+++ b/lib/bridgedb/configure.py
@@ -83,7 +83,8 @@ def loadConfig(configFile=None, configCls=None):
if itsSafeToUseLogging:
logging.debug(New configuration settings:)
logging.debug(\n.join([{0} = {1}.format(key, value)
- for key, value in configuration.items()]))
+ for key, value in configuration.items()
+ if not key.startswith('_')]))
# Create a :class:`Conf` from the settings stored within the local scope
# of the ``configuration`` dictionary:
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [bridgedb/develop] Decrease insane ammounts of logging for adding proxies to ProxySet.
commit 5d8f47943c78f87821d6102a72fe321a3fce8b39 Author: Isis Lovecruft i...@torproject.org Date: Thu Apr 2 05:07:58 2015 + Decrease insane ammounts of logging for adding proxies to ProxySet. --- lib/bridgedb/proxy.py |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/bridgedb/proxy.py b/lib/bridgedb/proxy.py index 3940ed6..7fab5af 100644 --- a/lib/bridgedb/proxy.py +++ b/lib/bridgedb/proxy.py @@ -92,7 +92,6 @@ def loadProxiesFromFile(filename, proxySet=None, removeStale=False): if isinstance(proxySet, ProxySet): # ProxySet.add() will validate the IP address if proxySet.add(line, tag=filename): -logging.info(Added %s to the proxy list. % line) addresses.append(line) else: ip = isIPAddress(line) @@ -170,7 +169,7 @@ class ProxySet(MutableSet): ip = isIPAddress(ip) if ip: if self._proxies.isdisjoint(set(ip)): -logging.debug(Adding %s to proxy list %r... % (ip, self)) +logging.debug(Adding %s to proxy list... % ip) self._proxies.add(ip) self._proxydict[ip] = tag if tag else time.time() return True ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [bridgedb/develop] Fix docs for BridgeBackwardsCompatibility.getConfigLine() request param.
commit c79290e0b009fdcd303961910db7ddcf0627c32f Author: Isis Lovecruft i...@torproject.org Date: Tue Apr 14 07:37:06 2015 + Fix docs for BridgeBackwardsCompatibility.getConfigLine() request param. --- lib/bridgedb/bridges.py |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 5c2731c..5c0afd8 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -715,10 +715,10 @@ class BridgeBackwardsCompatibility(BridgeBase): :type addressClass: :class:`ipaddr.IPv4Address` or :class:`ipaddr.IPv6Address`. :param addressClass: Type of address to choose. -:param str request: A string unique to this request e.g. email-address -or ``uniformMap(ip)`` or ``'default'``. In this case, this is not -a :class:`~bridgerequest.BridgeRequestBase` (as might be expected) -but the equivalent of +:param str request: A string (somewhat) unique to this request, +e.g. email-address or ``IPBasedDistributor.getSubnet(ip)``. In +this case, this is not a :class:`~bridgerequest.BridgeRequestBase` +(as might be expected) but the equivalent of :data:`bridgerequest.BridgeRequestBase.client`. :param str transport: A pluggable transport method name. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [bridgedb/develop] Remove duplicate doctest runs for some modules.
commit 016b6e2ea26c0444bda6074087032d0d42bf7a02 Author: Isis Lovecruft i...@torproject.org Date: Tue Apr 14 08:54:58 2015 + Remove duplicate doctest runs for some modules. --- lib/bridgedb/test/legacy_Tests.py |8 1 file changed, 8 deletions(-) diff --git a/lib/bridgedb/test/legacy_Tests.py b/lib/bridgedb/test/legacy_Tests.py index 4d0c53c..a039f91 100644 --- a/lib/bridgedb/test/legacy_Tests.py +++ b/lib/bridgedb/test/legacy_Tests.py @@ -9,7 +9,6 @@ separate from the production codebase. from __future__ import print_function -import doctest import os import random import sqlite3 @@ -653,13 +652,6 @@ def testSuite(): for klass in [IPBridgeDistTests, SQLStorageTests, EmailBridgeDistTests, BridgeStabilityTests]: suite.addTest(loader.loadTestsFromTestCase(klass)) - -for module in [ bridgedb.Bridges, -bridgedb.Main, -bridgedb.Dist, -bridgedb.schedule ]: -suite.addTest(doctest.DocTestSuite(module)) - return suite def main(): ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [bridgedb/develop] Move N_IP_CLUSTERS into the HTTPS distributor-specific settings.
commit 70009a726f6076036f29909fc5476ae4cc94fd2d Author: Isis Lovecruft i...@torproject.org Date: Thu Apr 2 01:32:45 2015 + Move N_IP_CLUSTERS into the HTTPS distributor-specific settings. --- bridgedb.conf | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index 2a1c367..cbdead0 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -217,12 +217,6 @@ NO_DISTRIBUTION_COUNTRIES = ['IR', 'SY'] # will treat them specially. PROXY_LIST_FILES = [] -# How many clusters do we group IPs in when distributing bridges based on IP? -# Note that if PROXY_LIST_FILES is set (below), what we actually do here -# is use one higher than the number here, and the extra cluster is used -# for answering requests made by IP addresses in the PROXY_LIST_FILES file. -N_IP_CLUSTERS = 4 - # If possible, always give a certain number of answers with a given ORPort. # This is a list of ``(port, minimum)`` tuples. FORCE_PORTS = [(443, 1)] @@ -300,6 +294,12 @@ HTTPS_INCLUDE_FINGERPRINTS = True # the *last* entry from its X-Forwarded-For header as the client's IP. HTTPS_USE_IP_FROM_FORWARDED_HEADER = False +# How many clusters do we group IPs in when distributing bridges based on IP? +# Note that if PROXY_LIST_FILES is set (below), what we actually do here +# is use one higher than the number here, and the extra cluster is used +# for answering requests made by IP addresses in the PROXY_LIST_FILES file. +N_IP_CLUSTERS = 4 + # (string or None) The period at which the available bridges rotates to a # separate set of bridges. This setting can be used in the form # ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [bridgedb/develop] Add an extra newline after email footers to avoid looking too busy.
commit efc3fdda61544360466a6882f0fb4a86d1e4abdc
Author: Isis Lovecruft i...@torproject.org
Date: Thu Apr 2 05:07:12 2015 +
Add an extra newline after email footers to avoid looking too busy.
---
lib/bridgedb/email/templates.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bridgedb/email/templates.py b/lib/bridgedb/email/templates.py
index ae85e8f..a6ff38c 100644
--- a/lib/bridgedb/email/templates.py
+++ b/lib/bridgedb/email/templates.py
@@ -150,7 +150,7 @@ def addFooter(template, clientAddress=None):
% (clientAddr,
now.strftime('%A, %d %B, %Y'),
now.strftime('%H:%M:%S'))
-footer += u'\n'
+footer += u'\n\n'
return footer
___
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.6.0esr-4.5-1] Merge remote-tracking branch 'arthur/13875' into tor-browser-31.6.0esr-4.5-1
commit 4c5a59914a15fa0795575f1f0b9ebe957bc52c65 Merge: 1a6eb58 a5648c8 Author: Mike Perry mikeperry-...@torproject.org Date: Wed Apr 15 18:41:42 2015 -0700 Merge remote-tracking branch 'arthur/13875' into tor-browser-31.6.0esr-4.5-1 dom/base/nsGlobalWindow.cpp | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) ___ 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.6.0esr-4.5-1] fixup! Bug #5856: Do not expose physical screen info via window window.screen.
commit a5648c8d80f396caf294d761cc4a9a76c0b33a9d
Author: Arthur Edelstein arthuredelst...@gmail.com
Date: Wed Apr 8 22:55:41 2015 -0700
fixup! Bug #5856: Do not expose physical screen info via window
window.screen.
---
dom/base/nsGlobalWindow.cpp | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 9fc9c31..2f85d60 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -4867,9 +4867,9 @@ nsGlobalWindow::GetOuterSize(ErrorResult aError)
MOZ_ASSERT(IsOuterWindow());
if (!IsChrome()) {
-CSSIntSize size;
-aError = GetInnerSize(size);
-return nsIntSize(size.width, size.height);
+CSSIntSize size;
+aError = GetInnerSize(size);
+return nsIntSize(size.width, size.height);
}
nsCOMPtrnsIBaseWindow treeOwnerAsWin = GetTreeOwnerWindow();
@@ -5114,6 +5114,11 @@ nsGlobalWindow::GetDevicePixelRatio(ErrorResult aError)
{
FORWARD_TO_OUTER_OR_THROW(GetDevicePixelRatio, (aError), aError, 0.0);
+ // For non-chrome callers, always return 1.0 to prevent fingerprinting.
+ if (!IsChrome()) {
+return 1.0;
+ }
+
if (!mDocShell) {
return 1.0;
}
___
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 737e0db0b6501c2249b640a2b513ac0dfdd17ca0 Author: Translation commit bot translat...@torproject.org Date: Thu Apr 16 00:46:00 2015 + Update translations for torbutton-torbuttonproperties --- ro/torbutton.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ro/torbutton.properties b/ro/torbutton.properties index cace1c7..d52df33 100644 --- a/ro/torbutton.properties +++ b/ro/torbutton.properties @@ -56,7 +56,7 @@ torbutton.popup.never_ask_again = Nu mai intreba din nou torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification_button = Deschide setÄrile de securitate torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. ___ 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.6.0esr-4.5-1] Revert TB1: Add a string-based cacheKey.
commit 5ad57a0b24c85d19427eddebc2f647296063acfd
Author: Mike Perry mikeperry-...@torproject.org
Date: Wed Apr 15 22:07:27 2015 -0700
Revert TB1: Add a string-based cacheKey.
This reverts commit 53f8f2506cb21bf1847a4261ef383db9be55a93c. This used to
be
used by Torbutton/SafeCache, but we moved the cache isolation to direct C++
patches instead.
---
netwerk/base/public/nsICachingChannel.idl |7 ---
netwerk/protocol/http/nsHttpChannel.cpp | 23 ---
netwerk/protocol/http/nsHttpChannel.h |1 -
3 files changed, 31 deletions(-)
diff --git a/netwerk/base/public/nsICachingChannel.idl
b/netwerk/base/public/nsICachingChannel.idl
index 09b1f75..9c1b0a6 100644
--- a/netwerk/base/public/nsICachingChannel.idl
+++ b/netwerk/base/public/nsICachingChannel.idl
@@ -64,13 +64,6 @@ interface nsICachingChannel : nsICacheInfoChannel
*/
attribute nsISupports cacheKey;
-/**
- * Set/get the cache domain... uniquely identifies the data in the cache
- * for this channel. Holding a reference to this key does NOT prevent
- * the cached data from being removed.
- */
-attribute AUTF8String cacheDomain;
-
/**
* Caching channel specific load flags:
*/
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp
b/netwerk/protocol/http/nsHttpChannel.cpp
index 59ba71b..bba507e 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -3271,12 +3271,6 @@ nsHttpChannel::AssembleCacheKey(const char *spec,
uint32_t postID,
cacheKey.Append(buf);
}
-if (strlen(mCacheDomain.get()) 0) {
-cacheKey.AppendLiteral(domain=);
-cacheKey.Append(mCacheDomain.get());
-cacheKey.AppendLiteral();
-}
-
if (!cacheKey.IsEmpty()) {
cacheKey.AppendLiteral(uri=);
}
@@ -5563,23 +5557,6 @@ nsHttpChannel::SetCacheTokenCachedCharset(const
nsACString aCharset)
PromiseFlatCString(aCharset).get());
}
-
-NS_IMETHODIMP
-nsHttpChannel::GetCacheDomain(nsACString value)
-{
-value = mCacheDomain;
-
-return NS_OK;
-}
-
-NS_IMETHODIMP
-nsHttpChannel::SetCacheDomain(const nsACString value)
-{
-mCacheDomain = value;
-
-return NS_OK;
-}
-
//-
// nsHttpChannel::nsICachingChannel
//-
diff --git a/netwerk/protocol/http/nsHttpChannel.h
b/netwerk/protocol/http/nsHttpChannel.h
index a76ed8e..ef59c0b 100644
--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
@@ -354,7 +354,6 @@ private:
nsCOMPtrnsICacheEntry mOfflineCacheEntry;
uint32_t mOfflineCacheLastModifiedTime;
nsCOMPtrnsIApplicationCache mApplicationCacheForWrite;
-nsCString mCacheDomain;
// auth specific data
nsCOMPtrnsIHttpChannelAuthProvider mAuthProvider;
___
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.6.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
commit 1a6eb58a1d3cab67e371ac861d04ba526d4e6751 Author: Georg Koppen g...@torproject.org Date: Tue Apr 14 10:31:39 2015 + fixup! TB4: Tor Browser's Firefox preference overrides. We remove the keep-alive restriction now that we have isolation to the URL bar domain which is governing this as well (see: bug 4100). --- browser/app/profile/000-tor-browser.js |1 - 1 file changed, 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 13bcf8e..192159b 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -132,7 +132,6 @@ pref(network.http.pipelining.maxrequests, 12); pref(network.http.pipelining.ssl, true); pref(network.http.proxy.pipelining, true); pref(security.ssl.enable_false_start, true); -pref(network.http.keep-alive.timeout, 20); pref(network.http.connection-retry-timeout, 0); pref(network.http.max-persistent-connections-per-proxy, 256); pref(network.http.pipelining.reschedule-timeout, 15000); ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor_animation] Update translations for tor_animation
commit 2b6c7de715abd4bdbea9607cd6fafc9f514a10d2 Author: Translation commit bot translat...@torproject.org Date: Thu Apr 16 03:15:54 2015 + Update translations for tor_animation --- id.srt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id.srt b/id.srt index 28d02b0..1961f01 100644 --- a/id.srt +++ b/id.srt @@ -160,5 +160,5 @@ seperti aktivists, journalists dan blogger. 35 00:02:04,000 -- 00:02:09,000 -Unduh dan gunakan Tor! Atau gunakan relay! +Unduh dan gunakan Tor! Atau gunakan relaynya! ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor_animation_completed] Update translations for tor_animation_completed
commit 2a7e96790608928174e4be5fe7e573f6e961bf32 Author: Translation commit bot translat...@torproject.org Date: Thu Apr 16 03:16:02 2015 + Update translations for tor_animation_completed --- id.srt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id.srt b/id.srt index 28d02b0..1961f01 100644 --- a/id.srt +++ b/id.srt @@ -160,5 +160,5 @@ seperti aktivists, journalists dan blogger. 35 00:02:04,000 -- 00:02:09,000 -Unduh dan gunakan Tor! Atau gunakan relay! +Unduh dan gunakan Tor! Atau gunakan relaynya! ___ 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.6.0esr-4.5-1] Merge remote-tracking branch 'gk/bug_10761_v2' into tor-browser-31.6.0esr-4.5-1
commit e1a8bafb44367592bc982c2a65752ec439b515a6 Merge: 5ad57a0 c9944b9c Author: Mike Perry mikeperry-...@torproject.org Date: Wed Apr 15 22:16:33 2015 -0700 Merge remote-tracking branch 'gk/bug_10761_v2' into tor-browser-31.6.0esr-4.5-1 security/nss/coreconf/WIN32.mk |5 + 1 file changed, 1 insertion(+), 4 deletions(-) ___ 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.6.0esr-4.5-1] Bug 10761: Fix shutdown crashes on Windows
commit c9944b9ca97a238304b61e822d7509ec4ac85a12 Author: Georg Koppen g...@torproject.org Date: Mon Apr 6 07:47:41 2015 + Bug 10761: Fix shutdown crashes on Windows Jacek Caban gave us this patch which should fix the shutdown crashes on Windows (#10761 and #14454) as newer GCC/Binutils versions do not need the workaround anymore that got implemented back then in https://bugzilla.mozilla.org/show_bug.cgi?id=337887. --- security/nss/coreconf/WIN32.mk |5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/security/nss/coreconf/WIN32.mk b/security/nss/coreconf/WIN32.mk index afece49..5c6cae0 100644 --- a/security/nss/coreconf/WIN32.mk +++ b/security/nss/coreconf/WIN32.mk @@ -94,10 +94,7 @@ endif DLL_SUFFIX = dll ifdef NS_USE_GCC -# The -mnop-fun-dllimport flag allows us to avoid a drawback of -# the dllimport attribute that a pointer to a function marked as -# dllimport cannot be used as as a constant address. -OS_CFLAGS += -mwindows -mms-bitfields -mnop-fun-dllimport +OS_CFLAGS += -mwindows -mms-bitfields _GEN_IMPORT_LIB=-Wl,--out-implib,$(IMPORT_LIBRARY) DLLFLAGS += -mwindows -o $@ -shared -Wl,--export-all-symbols $(if $(IMPORT_LIBRARY),$(_GEN_IMPORT_LIB)) ifdef BUILD_OPT ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] Update installer.patch for copying cert_override file
commit 78f0389f24db0fff49bbb3ca8cb1fccfaaf2e0d5 Author: Sukhbir Singh sukh...@torproject.org Date: Wed Apr 15 02:18:31 2015 -0400 Update installer.patch for copying cert_override file --- projects/instantbird/installer.patch |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/instantbird/installer.patch b/projects/instantbird/installer.patch index 2c5697c..3ba7e32 100644 --- a/projects/instantbird/installer.patch +++ b/projects/instantbird/installer.patch @@ -11,10 +11,10 @@ index 4f48e97..4e02fdf 100644 libs:: $(FILES) diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in -index 396d5f8..deca57e 100644 +index 0234b21..5d20e62 100644 --- a/im/installer/Makefile.in +++ b/im/installer/Makefile.in -@@ -109,7 +109,9 @@ MOZ_PKG_MAC_ICON=branding/disk.icns +@@ -113,7 +113,9 @@ MOZ_PKG_MAC_ICON=branding/disk.icns MOZ_PKG_MAC_EXTRA=--symlink /Applications:/ endif @@ -26,10 +26,10 @@ index 396d5f8..deca57e 100644 ifndef LIBXUL_SDK INSTALL_SDK = 1 diff --git a/im/installer/package-manifest.in b/im/installer/package-manifest.in -index a40698e..74abdca 100644 +index edf01b1..78db5e4 100644 --- a/im/installer/package-manifest.in +++ b/im/installer/package-manifest.in -@@ -156,6 +156,7 @@ +@@ -155,6 +155,7 @@ @RESPATH@/defaults/profile/localstore.rdf @RESPATH@/defaults/profile/prefs.js @RESPATH@/defaults/profile/mimeTypes.rdf ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] Initialize Tor Messenger branding
commit b76fa5f9ca482edd8dbee2a07e388279b08fa416 Author: Sukhbir Singh sukh...@torproject.org Date: Wed Apr 15 04:18:06 2015 -0400 Initialize Tor Messenger branding --- projects/instantbird/build |2 ++ projects/instantbird/mozconfig-linux-i686 |2 ++ projects/instantbird/mozconfig-linux-x86_64 |2 ++ projects/instantbird/mozconfig-windows-i686 |1 + 4 files changed, 7 insertions(+) diff --git a/projects/instantbird/build b/projects/instantbird/build index 91b0320..d2dcee1 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -38,6 +38,8 @@ do done cat ../spi-cacert.der mozilla/security/nss/lib/ckfw/builtins/certdata.txt cp ../cert_override.txt im/app/profile +mkdir im/branding/messenger +cp -R im/branding/nightly/* im/branding/messenger/ cd mozilla if ls -1 $rootdir/*.mozpatch /dev/null 21 then diff --git a/projects/instantbird/mozconfig-linux-i686 b/projects/instantbird/mozconfig-linux-i686 index 52fd2e9..7bb9b61 100644 --- a/projects/instantbird/mozconfig-linux-i686 +++ b/projects/instantbird/mozconfig-linux-i686 @@ -20,3 +20,5 @@ ac_add_options --disable-debug ac_add_options --with-l10n-base=.. ac_add_options --host=i686-linux-gnu + +ac_add_options --with-branding=im/branding/messenger diff --git a/projects/instantbird/mozconfig-linux-x86_64 b/projects/instantbird/mozconfig-linux-x86_64 index d3cf703..919b52e 100644 --- a/projects/instantbird/mozconfig-linux-x86_64 +++ b/projects/instantbird/mozconfig-linux-x86_64 @@ -16,3 +16,5 @@ ac_add_options --enable-optimize ac_add_options --disable-debug ac_add_options --with-l10n-base=.. + +ac_add_options --with-branding=im/branding/messenger diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686 index 4c67a40..f3c76c4 100644 --- a/projects/instantbird/mozconfig-windows-i686 +++ b/projects/instantbird/mozconfig-windows-i686 @@ -27,3 +27,4 @@ ac_add_options --disable-webrtc ac_add_options --disable-tests ac_add_options --disable-signmar +ac_add_options --with-branding=im/branding/messenger ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor-messenger-build/master] Create branding before applying the patches
commit e53475552105e92c67a3718341879555a9cbd25e
Author: Sukhbir Singh sukh...@torproject.org
Date: Wed Apr 15 07:11:10 2015 -0400
Create branding before applying the patches
---
projects/instantbird/build |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/projects/instantbird/build b/projects/instantbird/build
index d2dcee1..a999f32 100644
--- a/projects/instantbird/build
+++ b/projects/instantbird/build
@@ -32,15 +32,17 @@ cd moz
tar xf ../[% c('input_files_by_name/mozilla-src') %]
mv mozilla-* ../[% project %]-[% c('version') %]/mozilla
cd ../[% project %]-[% c('version') %]
+
+mkdir im/branding/messenger
+cp -R im/branding/nightly/* im/branding/messenger/
+
+cd mozilla
for patch in $(ls -1 ../*.patch | sort)
do
patch -p1 $patch
done
cat ../spi-cacert.der mozilla/security/nss/lib/ckfw/builtins/certdata.txt
cp ../cert_override.txt im/app/profile
-mkdir im/branding/messenger
-cp -R im/branding/nightly/* im/branding/messenger/
-cd mozilla
if ls -1 $rootdir/*.mozpatch /dev/null 21
then
for patch in $(ls -1 $rootdir/*.mozpatch | sort)
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor_animation] Update translations for tor_animation
commit 80c24a8d35ba9ae4dc5a884b1160f6e2537da21e Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 11:15:54 2015 + Update translations for tor_animation --- ru.srt | 32 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ru.srt b/ru.srt index 78c998d..325cd74 100644 --- a/ru.srt +++ b/ru.srt @@ -1,48 +1,48 @@ 1 00:00:00,660 -- 00:00:02,780 -We've gotten very used to the Internet. +ÐÑ Ð¾ÑÐµÐ½Ñ Ð¿ÑивÑкли к инÑеÑнеÑÑ. 2 00:00:03,120 -- 00:00:07,700 -We are constantly sharing information -about ourselves and our private lives: +ÐÑ Ð¿Ð¾ÑÑоÑнно делимÑÑ Ð¸Ð½ÑоÑмаÑией +о наÑей ÑаÑÑной жизни: 3 00:00:08,000 -- 00:00:09,960 -food we eat, people we meet, +ÑÑо Ð¼Ñ ÐµÐ´Ð¸Ð¼, Ñ ÐºÐµÐ¼ вÑÑÑеÑаемÑÑ, 4 00:00:10,180 -- 00:00:12,480 -places we go, and the stuff we read. +кÑда Ñ Ð¾Ð´Ð¸Ð¼ и ÑÑо Ð¼Ñ ÑиÑаем. 5 00:00:13,280 -- 00:00:14,640 -Let me explain it better. +СейÑÐ°Ñ Ð¾Ð±ÑÑÑÐ½Ñ Ð¿Ð¾Ð´Ñобнее. 6 00:00:14,920 -- 00:00:17,740 -Right at this moment, -if someone attempts to look you up, +ÐÑÑмо ÑейÑаÑ, +еÑли кÑо-Ñо Ð·Ð°Ñ Ð¾ÑÐµÑ Ð²Ð°Ñ Ð½Ð°Ð¹Ñи, 7 00:00:18,060 -- 00:00:22,480 -they'll see your real identity, -precise location, operating system, +они ÑвидÑÑ Ð²Ð°ÑÑ Ð¿Ð¾Ð´ÐµÐ½Ð½ÑÑ Ð¸Ð½ÑоÑмаÑиÑ, +ÑоÑное меÑÑÐ¾Ð½Ð°Ñ Ð¾Ð¶Ð´ÐµÐ½Ð¸Ðµ, опеÑаÑионнÑÑ ÑиÑÑемÑ, 8 00:00:22,800 -- 00:00:26,500 -all the sites you've visited, -the browser you use to surf the web, +вÑе ÑайÑÑ ÐºÐ¾ÑоÑÑе Ð²Ñ Ð¿Ð¾ÑеÑали, +Ð²Ð°Ñ Ð±ÑаÑзеÑ, 9 00:00:26,700 -- 00:00:29,140 -and so much more information -about you and your life +и еÑе болÑÑе инÑоÑмаÑии +о Ð²Ð°Ñ Ð¸ ваÑей жизни 10 00:00:29,620 -- 00:00:32,460 -which you probably didn't mean -to share with unknown strangers, +коÑоÑой Ð²Ñ Ð²ÑÑд ли Ñ Ð¾Ñели +делиÑÑÑ Ñ Ð½ÐµÐ·Ð½Ð°ÐºÐ¾Ð¼Ñами, 11 00:00:32,920 -- 00:00:35,840 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tor_animation] Update translations for tor_animation
commit 05198c5939f317264fb4932e2181145c69aabfe6 Author: Translation commit bot translat...@torproject.org Date: Wed Apr 15 11:45:52 2015 + Update translations for tor_animation --- ru.srt | 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/ru.srt b/ru.srt index 325cd74..fbc1a64 100644 --- a/ru.srt +++ b/ru.srt @@ -46,27 +46,26 @@ 11 00:00:32,920 -- 00:00:35,840 -who could easily use this data -to exploit you. +коÑоÑÑе легко ÑмогÑÑ Ð¸ÑполÑзоваÑÑ ÑÑÑ Ð¸Ð½ÑоÑмаÑÐ¸Ñ +пÑоÑив ваÑ. 12 00:00:36,220 -- 00:00:38,120 -But not if you're using Tor! +Ðо не ÑмогÑÑ ÐµÑли ÐÑ Ð¸ÑполÑзÑеÑе Tor! 13 00:00:39,140 -- 00:00:42,840 -Tor Browser protects our privacy -and identity on the Internet. +ÐÑаÑÐ·ÐµÑ Tor Ð¾Ñ ÑанÑÐµÑ Ð½Ð°ÑÑ Ð¿ÑиваÑноÑÑÑ +и лиÑноÑÑÑ Ð² инÑеÑнеÑе. 14 00:00:43,560 -- 00:00:46,760 -Tor secures your connection -with three layers of encryption +Tor заÑиÑÐ°ÐµÑ Ð²Ð°Ñе Ñоединение + ÑÑÐµÐ¼Ñ ÑлоÑми ÑиÑÑÐ¾Ð²Ð°Ð½Ð¸Ñ 15 00:00:46,940 -- 00:00:51,760 -and passes it through three voluntarily -operated servers around the world, +и пÑопÑÑÐºÐ°ÐµÑ ÐµÐ³Ð¾ ÑеÑез ÑÑи добÑоволÑно ÑкÑплÑаÑиÑÑемÑе ÑеÑвеÑÑ Ð¿Ð¾ вÑÐµÐ¼Ñ Ð¼Ð¸ÑÑ, 16 00:00:52,280 -- 00:00:55,520 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
