- tor-commits - lists.torproject.org

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 16 Sep '12

16 Sep '12

commit a8901827c548e9b59f98e0cfaa758276235eca90 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 16 14:15:31 2012 +0000 Update translations for https_everywhere --- he/https-everywhere.properties | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/he/https-everywhere.properties b/he/https-everywhere.properties new file mode 100644 index 0000000..b639efe --- /dev/null +++ b/he/https-everywhere.properties @@ -0,0 +1,5 @@ +https-everywhere.menu.globalEnable = להפעיל את HTTPS Everywhere +https-everywhere.menu.globalDisable = להשבית את HTTPS Everywhere +https-everywhere.menu.enableDisable = להפעיל/להשבית כללים +https-everywhere.menu.noRules = (אין כללים עבור דף זה) +https-everywhere.menu.unknownRules = (כללים לדף זה אינם ידועים)

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 16 Sep '12

16 Sep '12

commit 3f49e8ab9e5df3ed01a119939f85ec82b9a39284 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 16 00:15:15 2012 +0000 Update translations for vidalia_completed --- zh_CN/vidalia_zh_CN.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/zh_CN/vidalia_zh_CN.po b/zh_CN/vidalia_zh_CN.po index 5cdf475..79bc472 100644 --- a/zh_CN/vidalia_zh_CN.po +++ b/zh_CN/vidalia_zh_CN.po @@ -2,6 +2,7 @@ # Translators: # Christopher Meng <cickumqt(a)gmail.com>, 2012. # Curtis Stone <cstone(a)fastmail.cn>, 2012. +# <iruf(a)outlook.com>, 2012. # Kevin Chen <szescxz(a)126.com>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. # <szescxz(a)126.com>, 2011. @@ -11,14 +12,14 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-08-04 02:13+0000\n" -"Last-Translator: xtoaster <zhazhenzhong(a)gmail.com>\n" +"PO-Revision-Date: 2012-09-16 00:11+0000\n" +"Last-Translator: iruf <iruf(a)outlook.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: zh_CN\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Vidalia ts2po 0.2\n" msgctxt "AboutDialog" @@ -2399,7 +2400,7 @@ msgstr "自动保存新的消息内容至文件" msgctxt "MessageLog" msgid "Basic" -msgstr "基本法" +msgstr "基本" msgctxt "MessageLog" msgid "Tor Status"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 16 Sep '12

16 Sep '12

commit bdfc0ca4d0b8bfbfd94e71208ff9bbf961a284d2 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 16 00:15:09 2012 +0000 Update translations for vidalia --- zh_CN/vidalia_zh_CN.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/zh_CN/vidalia_zh_CN.po b/zh_CN/vidalia_zh_CN.po index 5cdf475..79bc472 100644 --- a/zh_CN/vidalia_zh_CN.po +++ b/zh_CN/vidalia_zh_CN.po @@ -2,6 +2,7 @@ # Translators: # Christopher Meng <cickumqt(a)gmail.com>, 2012. # Curtis Stone <cstone(a)fastmail.cn>, 2012. +# <iruf(a)outlook.com>, 2012. # Kevin Chen <szescxz(a)126.com>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. # <szescxz(a)126.com>, 2011. @@ -11,14 +12,14 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-08-04 02:13+0000\n" -"Last-Translator: xtoaster <zhazhenzhong(a)gmail.com>\n" +"PO-Revision-Date: 2012-09-16 00:11+0000\n" +"Last-Translator: iruf <iruf(a)outlook.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: zh_CN\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Vidalia ts2po 0.2\n" msgctxt "AboutDialog" @@ -2399,7 +2400,7 @@ msgstr "自动保存新的消息内容至文件" msgctxt "MessageLog" msgid "Basic" -msgstr "基本法" +msgstr "基本" msgctxt "MessageLog" msgid "Tor Status"

1 0

[tor-cloud/master] remove whitespace in the middle of a command
by runa＠torproject.org 15 Sep '12

15 Sep '12

commit cfbcad5bc92a3ad078d4492f75abd17b16bd1ee0 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Sep 15 22:58:16 2012 +0100 remove whitespace in the middle of a command --- build.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build.sh b/build.sh index cf4367a..2939c89 100755 --- a/build.sh +++ b/build.sh @@ -96,7 +96,7 @@ ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ub # Continue the build process echo "Verified the signature, continue with the build process" -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && tar -Sxvzf /mnt/ubuntu-12.04-server-cloudimg-i386.tar.gz && sudo mkdir /mnt/src /mnt/target && sudo mount -o lo op,rw /mnt/precise-server-cloudimg-i386.img /mnt/src && sudo mkfs.ext4 -F -L cloudimg-rootfs /dev/xvdh && sudo mount /dev/xvdh /mnt/target" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && tar -Sxvzf /mnt/ubuntu-12.04-server-cloudimg-i386.tar.gz && sudo mkdir /mnt/src /mnt/target && sudo mount -o loop,rw /mnt/precise-server-cloudimg-i386.img /mnt/src && sudo mkfs.ext4 -F -L cloudimg-rootfs /dev/xvdh && sudo mount /dev/xvdh /mnt/target" # this is our startup file that loads tor-prep.sh on first boot ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo wget https://gitweb.torproject.org/tor-cloud.git/blob_plain/HEAD:/rc.local -O /mnt/src/etc/rc.local"

1 0

[tor-cloud/master] Use apt-get and not aptitude
by runa＠torproject.org 15 Sep '12

15 Sep '12

commit b7d62fefc67178dc3beaa31f5c6d05c62898db3e Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Sep 15 22:27:36 2012 +0100 Use apt-get and not aptitude --- rc.local | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/rc.local b/rc.local index a2af486..8593f96 100644 --- a/rc.local +++ b/rc.local @@ -1,4 +1,5 @@ #!/bin/sh -e -sudo aptitude -y safe-upgrade +sudo apt-get -y update +sudo apt-get -y upgrade sudo /etc/ec2-prep.sh type exit 0

1 0

[tor-cloud/master] Use upgrade and not safe-upgrade with apt-get
by runa＠torproject.org 15 Sep '12

15 Sep '12

commit 7d4e7b3383ba6e3a1f2cc8842d549d3c9bdc6d75 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Sep 15 22:27:54 2012 +0100 Use upgrade and not safe-upgrade with apt-get --- ec2-prep.sh | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index a32c148..9236527 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -25,7 +25,7 @@ fi # Get the latest package updates echo "Updating the system..." apt-get update -apt-get -y safe-upgrade +apt-get -y upgrade # Configure unattended-upgrades. The system will automatically download, # install and configure all packages, and reboot if necessary. @@ -267,9 +267,3 @@ echo "Done configuring the system, will reboot" echo "Your system has been configured for blocking diagnostics" > /etc/ec2-prep.sh reboot fi - -# XXX TODO -# Generally, we'll want to rm /var/lib/tor/* and remove all state from the system -# -# We're done; tell the user and then reboot the system -#reboot

1 0

[tor-cloud/master] Use the correct device label when creating and mounting
by runa＠torproject.org 15 Sep '12

15 Sep '12

commit b72e124ea7d40c02135cb4c9ea8762a609dd2a93 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Sep 15 22:26:21 2012 +0100 Use the correct device label when creating and mounting --- build.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build.sh b/build.sh index 2534cde..cf4367a 100755 --- a/build.sh +++ b/build.sh @@ -96,7 +96,7 @@ ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ub # Continue the build process echo "Verified the signature, continue with the build process" -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && tar -Sxvzf /mnt/ubuntu-12.04-server-cloudimg-i386.tar.gz && sudo mkdir /mnt/src /mnt/target && sudo mount -o loop,rw /mnt/precise-server-cloudimg-i386.img /mnt/src && sudo mkfs.ext4 -F -L cloudimg-rootfs /dev/sdh && sudo mount /dev/sdh /mnt/target" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo chown ubuntu:ubuntu /mnt && cd /mnt && tar -Sxvzf /mnt/ubuntu-12.04-server-cloudimg-i386.tar.gz && sudo mkdir /mnt/src /mnt/target && sudo mount -o lo op,rw /mnt/precise-server-cloudimg-i386.img /mnt/src && sudo mkfs.ext4 -F -L cloudimg-rootfs /dev/xvdh && sudo mount /dev/xvdh /mnt/target" # this is our startup file that loads tor-prep.sh on first boot ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo wget https://gitweb.torproject.org/tor-cloud.git/blob_plain/HEAD:/rc.local -O /mnt/src/etc/rc.local"

1 0

[tor/master] fold in changes files so far
by arma＠torproject.org 15 Sep '12

15 Sep '12

commit 2e342df7cdde5236ce2bdf2db457d193bdbffa5e Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 15 16:38:47 2012 -0400 fold in changes files so far --- ChangeLog | 57 +++++++++++++++++++++++++++++++++++++++++++++ changes/bug6341 | 5 ---- changes/bug6538 | 16 ------------ changes/bug6811 | 5 ---- changes/bug6815 | 6 ---- changes/bug6819 | 3 -- changes/bug6827 | 9 ------- changes/bug6831 | 4 --- changes/bug6833 | 4 --- changes/bug6844 | 4 --- changes/old_gcc_macro_fix | 5 ---- changes/refactor_config | 3 -- 12 files changed, 57 insertions(+), 64 deletions(-) diff --git a/ChangeLog b/ChangeLog index 495ddf2..c517207 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,60 @@ +Changes in version 0.2.4.3-alpha - 2012-09-?? + o Security fixes: + - Fix an assertion failure in tor_timegm() that could be triggered + by a badly formatted directory object. Bug found by fuzzing with + Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc. + + o Major bugfixes: + - Fix a possible crash bug when checking for deactivated circuits + in connection_or_flush_from_first_active_circuit(). Fixes bug 6341; + bugfix on 0.2.2.7-alpha. Bug report and fix received pseudonymously. + - Allow routers to detect that their own DirPorts are running. When + we removed support for versions_supports_begindir, we also + accidentally removed the mechanism we used to self-test our + DirPort. Diagnosed with help from kargig. Fixes bugs 6814 and 6815; + bugfix on 0.2.4.2-alpha. + + o Security features: + - Switch to a completely time-invariant approach for picking nodes + weighted by bandwidth. Our old approach would run through the + part of the loop after it had made its choice slightly slower + than it ran through the part of the loop before it had made its + choice. Addresses ticket 6538. + + o Minor bugfixes: + - Correct file sizes when reading binary files on Cygwin, to avoid + a bug where Tor would fail to read its state file. Fixes bug 6844; + bugfix on 0.1.2.7-alpha. + - Fix round_to_power_of_2() so it doesn't invoke undefined behavior + with large values. This situation was untriggered, but nevertheless + incorrect. Fixes bug 6831; bugfix on 0.2.0.1-alpha. + - Reject consensus votes with more than 64 known-flags. We aren't even + close to that limit yet, and our code doesn't handle it correctly. + Fixes bug 6833; bugfix on 0.2.0.1-alpha. + - Avoid undefined behaviour when parsing the list of supported + rendezvous/introduction protocols in a hidden service descriptor. + Previously, Tor would have confused (as-yet-unused) protocol version + numbers greater than 32 with lower ones on many platforms. Fixes + bug 6827; bugfix on 0.2.0.10-alpha. Found by George Kadianakis. + - Fix building with older versions of GCC that don't like preprocessor + directives inside macro arguments. Found by grarpamp. Fixes bug + 6842; bugfix on 0.2.4.2-alpha. + - Switch weighted node selection rule from using a list of doubles + to using a list of int64_t. This change should make the process + slightly easier to debug and maintain. Needed to finish ticket 6538. + + o Code simplification and refactoring: + - Move the generic "config" code into a new file, and have "config.c" + hold only torrc- and state-related code. Resolves ticket 6823. + - Move the core of our "choose a weighted element at random" logic + into its own function, and give it unit tests. Now the logic is + testable, and a little less fragile too. + + o Documentation fixes: + - Resolve a typo in torrc.sample.in. Fixes bug 6819; bugfix on + 0.2.3.14-alpha. + + Changes in version 0.2.3.22-rc - 2012-09-11 Tor 0.2.3.22-rc fixes another opportunity for a remotely triggerable assertion. diff --git a/changes/bug6341 b/changes/bug6341 deleted file mode 100644 index 04e52c7..0000000 --- a/changes/bug6341 +++ /dev/null @@ -1,5 +0,0 @@ - o Major bugfixes: - - Fix a possible crash bug when checking for deactivated circuits - in connection_or_flush_from_first_active_circuit(). Fixes bug - 6341; bugfix on 0.2.2.7-alpha. Bug report and fix received - pseudonymously. diff --git a/changes/bug6538 b/changes/bug6538 deleted file mode 100644 index 03c168b..0000000 --- a/changes/bug6538 +++ /dev/null @@ -1,16 +0,0 @@ - o Minor bugfixes: - - Switch weighted node selection rule from using a list of doubles - to using a list of int64_t. This should make the process slightly - easier to debug and maintain. Needed for fix for bug 6538. - - o Security features: - - Switch to a completely time-invariant approach for picking nodes - weighted by bandwidth. Our old approach would run through the - part of the loop after it had made its choice slightly slower - than it ran through the part of the loop before it had made its - choice. Fix for bug 6538. - - o Code simplifications and refactoring: - - Move the core of our "choose a weighted element at random" logic - into its own function, and give it unit tests. Now the logic is - testable, and a little less fragile too. diff --git a/changes/bug6811 b/changes/bug6811 deleted file mode 100644 index 841ec1c..0000000 --- a/changes/bug6811 +++ /dev/null @@ -1,5 +0,0 @@ - o Major security fixes: - - Fix an assertion failure in tor_timegm that could be triggered - by a badly formatted directory object. Bug found by fuzzing with - Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc. - diff --git a/changes/bug6815 b/changes/bug6815 deleted file mode 100644 index d6a1233..0000000 --- a/changes/bug6815 +++ /dev/null @@ -1,6 +0,0 @@ - o Major bugfixes: - - Allow routers to correctly detect their own DirPorts as running. - When we removed support for versions_supports_begindir, we also - accidentally removed the mechanism we used to self-test our - DirPort. Diagnosed with help from kargig. Fixes bugs 6814 and - 6815; bugfix on 0.2.4.2-alpha. diff --git a/changes/bug6819 b/changes/bug6819 deleted file mode 100644 index 8b5c224..0000000 --- a/changes/bug6819 +++ /dev/null @@ -1,3 +0,0 @@ - o Documentation fixes: - - Resolve a typo in torrc.sample.in. Fixes bug 6819; bugfix on - 0.2.3.14-alpha. diff --git a/changes/bug6827 b/changes/bug6827 deleted file mode 100644 index bf71d2b..0000000 --- a/changes/bug6827 +++ /dev/null @@ -1,9 +0,0 @@ - o Minor bugfixes: - - - Avoid undefined behaviour when parsing the list of supported - rendezvous/introduction protocols in a hidden service - descriptor. Previously, Tor would have confused (as-yet-unused) - protocol version numbers greater than 32 with lower ones on many - platforms. Fixes bug 6827; bugfix on 0.2.0.10-alpha; found by - George Kadianakis. - diff --git a/changes/bug6831 b/changes/bug6831 deleted file mode 100644 index ac4775b..0000000 --- a/changes/bug6831 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Fix round_to_power_of_2 so it doesn't invoke undefined behavior - with large values. This was untriggered, but nevertheless incorrect. - Fixes bug 6831; bugfix on 0.2.0.1-alpha. diff --git a/changes/bug6833 b/changes/bug6833 deleted file mode 100644 index 4a6a5d3..0000000 --- a/changes/bug6833 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (directory authority): - - Reject consensus votes with more than 64 known-flags. We aren't even - close to that limit yet, and our code doesn't handle it - correctly. Fixes bug 6833; bugfix on 0.2.0.1-alpha. diff --git a/changes/bug6844 b/changes/bug6844 deleted file mode 100644 index 338e19d..0000000 --- a/changes/bug6844 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes: - - Correct file sizes when reading binary files on - Cygwin, to avoid a bug where Tor would fail to read its state file. - Fixes bug 6844; bugfix on 0.1.2.7-alpha. diff --git a/changes/old_gcc_macro_fix b/changes/old_gcc_macro_fix deleted file mode 100644 index 5fc0a47..0000000 --- a/changes/old_gcc_macro_fix +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Fix building with older versions of GCC that don't like preprocessor - directives inside macro arguments. Found by grarpamp. Fixes bug 6842; - bugfix on 0.2.4.2-alpha. - diff --git a/changes/refactor_config b/changes/refactor_config deleted file mode 100644 index 8d272e7..0000000 --- a/changes/refactor_config +++ /dev/null @@ -1,3 +0,0 @@ - o Code simplification and refactoring: - - Move the generic "config" code into a new file, and have "config.c" - hold only torrc- and state-related code.

1 0

[tor-cloud/master] Close connecting if we cannot fetch the gpg key
by runa＠torproject.org 15 Sep '12

15 Sep '12

commit e6822aabbcd7ffc8e1bd6081a234e99af1e5d3e6 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Sat Sep 15 21:18:26 2012 +0100 Close connecting if we cannot fetch the gpg key --- build.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/build.sh b/build.sh index e8cfa37..2534cde 100755 --- a/build.sh +++ b/build.sh @@ -88,6 +88,7 @@ ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ub # Verify the signature echo "Verify the signature" ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "sudo gpg --keyserver keys.gnupg.net --recv-key 7DB87C81" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "if [ `echo $?` -eq "1" ]; then echo 'Could not get key, will lock you out of the instance' ; sudo rm /home/ubuntu/.ssh/authorized_keys ; fi" ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "cd /mnt ; sudo gpg --verify SHA256SUMS.gpg SHA256SUMS" ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "cd /mnt ; sudo sha256sum -c SHA256SUMS 2>&1 | grep OK" ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -t "echo $?"

1 0

[ooni-probe/master] * Fixed bug in the assets parser.
by isis＠torproject.org 15 Sep '12

15 Sep '12

commit 21505f84aef5d60c7e138590a1a40e3df773d680 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Sep 15 07:49:29 2012 +0000 * Fixed bug in the assets parser. --- .gitignore | 1 + ooni/assets/bridgetests.txt | 5 ----- ooni/plugins/bridget.py | 13 ++++++++++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 7f270bb..686e319 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ proxy-lists/italy-http-ips.txt private/* /ooni/plugins/dropin.cache oonib/oonibackend.conf +ooni/lib/txtorcon \ No newline at end of file diff --git a/ooni/assets/bridgetests.txt b/ooni/assets/bridgetests.txt deleted file mode 100644 index 7bba841..0000000 --- a/ooni/assets/bridgetests.txt +++ /dev/null @@ -1,5 +0,0 @@ -#213.151.89.102:9001 -#108.166.106.156:443 -#217.150.224.213:443 -85.193.252.111:443 -#68.98.41.14:9001 diff --git a/ooni/plugins/bridget.py b/ooni/plugins/bridget.py index 745815f..49565d8 100644 --- a/ooni/plugins/bridget.py +++ b/ooni/plugins/bridget.py @@ -200,11 +200,11 @@ class BridgetTest(OONITest): ## we should probably find a more memory nice way to load addresses, ## in case the files are really large if self.local_options: - @staticmethod + def make_asset_list(opt, lst): log.msg("Loading information from %s ..." % opt) with open(opt) as opt_file: - for line in opt_file.readline(): + for line in opt_file.readlines(): if line.startswith('#'): continue else: @@ -389,7 +389,7 @@ class BridgetTest(OONITest): if len(self.bridge_list) >= 1: for bridge in self.bridge_list: try: - print "BRIDGE IS %s" % bridge + log.msg("Current Bridge: %s" % bridge) reconf_controller(self.config, bridge) except: reconf_fail(bridge) @@ -421,6 +421,10 @@ bridget = BridgetTest(None, None, None) ## ----------- ## self.config.save() only needs to be called if Tor is already running. ## +## to test gid, uid, and euid: +## with open('/proc/self/state') as uidfile: +## print uidfile.read(1000) +## ## TODO: ## o add option for any kwarg=arg self.config setting ## o cleanup documentation @@ -428,6 +432,9 @@ bridget = BridgetTest(None, None, None) ## o check if bridges are public relays ## o take bridge_desc file as input, also be able to give same ## format as output +## o Add assychronous timout for deferred, so that we don't wait +## forever for bridges that don't work. +## o Add mechanism for testing through another host ## ## FIX: ## o DataDirectory is not found, or permissions aren't right

1 0