February 2015 - tor-commits - lists.torproject.org

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 10 Feb '15

10 Feb '15

commit f67c5453661ae95755113e704c470dbf2341ec56 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 10 07:15:36 2015 +0000 Update translations for tails-misc --- hr_HR.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hr_HR.po b/hr_HR.po index 5aee662..2d14f86 100644 --- a/hr_HR.po +++ b/hr_HR.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-01-14 16:01+0100\n" -"PO-Revision-Date: 2015-02-09 12:32+0000\n" +"PO-Revision-Date: 2015-02-10 07:02+0000\n" "Last-Translator: skiddiep <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -305,7 +305,7 @@ msgstr "Sav mrežni rad onemogućen" msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "MAC ometanje neuspješno za mrežnu karticu ${nic_name} (${nic}). Oporavak od pogreške takođe nije uspio tako da je svo umrežavanje onemogućeno.\nMožda biste radije ponovo pokrenuli Tails i onesposobili MAC ometanje. Pogledajte <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentaciju</a>." +msgstr "MAC maskiranje nije uspjelo za mrežnu karticu ${nic_name} (${nic}). Oporavak od pogreške također nije uspio tako da je sav mrežni rad onemogućen.\nMožda biste radije ponovo pokrenuli Tails i onesposobili MAC maskiranje. Pogledajte <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentaciju</a>." #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:61 @@ -328,24 +328,24 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See https://tails.boum.org/doc/first_steps/upgrade#manual" -msgstr "Nedovoljno slobodne memorije za provjeru nadogradnje.\n\nUvjerite se da sistem zadovoljava sve zahtjeve za pokretanje Tails-a.\nPogledajte datoteku :///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nPokušajte da ponovo pokrenete Tails i potrazite moguće nadogradnje.\n\nIli nadogradnju izvrsite manuelno.\nPogledajte https://tails.boum.org/doc/first_steps/upgrade#manual" +msgstr "Nedovoljno memorije za provjeru nadogradnje.\n\nOsigurajte da sustav zadovoljava sve zahtjeve za pokretanje Tails-a.\nPogledajte datoteku :///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nPokušajte ponovno pokrenuti Tails i da bi ponovno potražili nadogradnje.\n\nIli izvršite manualnu nadogradnju.\nPogledajte https://tails.boum.org/doc/first_steps/upgrade#manual" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!" -msgstr "Upozorenje : Virtualna mašina otkrivena ! " +msgstr "Upozorenje : Virtualna mašina otkrivena!" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:55 msgid "" "Both the host operating system and the virtualization software are able to " "monitor what you are doing in Tails." -msgstr "I domaći operativni sustav i softver za virtualizaciju su u mogućnosti da prate što radite u Tails." +msgstr "Domaćinski operativni sustav i softver za virtualizaciju mogu pratiti što radite u Tails-u." #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:57 msgid "" "<a " "href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Learn" " more...</a>" -msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Nauči više...</a>" +msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html'>Naučite više...</a>" #: config/chroot_local-includes/usr/local/bin/tor-browser:18 msgid "Tor is not ready" @@ -365,7 +365,7 @@ msgstr "Otkaži" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:72 msgid "Do you really want to launch the Unsafe Browser?" -msgstr "Da li sigurno želite da pokrenete nesiguran pretraživač ? " +msgstr "Da li sigurno želite pokrenuti nesiguran pretraživač?" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:74 msgid ""

1 0

[tor/master] Return 0 when detecting the amount of memory fails
by nickm＠torproject.org 10 Feb '15

10 Feb '15

commit 9ae321db66cf83453b34c75d889599ea4a75642b Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Mon Feb 9 01:58:22 2015 +0000 Return 0 when detecting the amount of memory fails Fixes bug 14802; bugfix on 0.2.5.4-alpha. --- changes/bug14802 | 4 ++++ src/common/compat.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug14802 b/changes/bug14802 new file mode 100644 index 0000000..fc7cfd1 --- /dev/null +++ b/changes/bug14802 @@ -0,0 +1,4 @@ + o Minor bugfix: + - Make an educated guess about how much memory the system has when our + detection functionality fails on some operating system. Fixes bug 14802; + bugfix on 0.2.5.4-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index e25ecc4..3eda1ca 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -3517,7 +3517,7 @@ get_total_system_memory_impl(void) size_t len = sizeof(memsize); int mib[2] = {CTL_HW, HW_USERMEM}; if (sysctl(mib,2,&memsize,&len,NULL,0)) - return -1; + return 0; return memsize;

1 0

[tor/master] Merge remote-tracking branch 'sysrqb/bug14802_025'
by nickm＠torproject.org 10 Feb '15

10 Feb '15

commit 5c820def993cad85d18e887af74087163d769f04 Merge: f4c0735 9ae321d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 9 22:39:55 2015 -0800 Merge remote-tracking branch 'sysrqb/bug14802_025' changes/bug14802 | 4 ++++ src/common/compat.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Avoid calling SMARTLIST_FOREACH on a NULL smartlist in tests
by nickm＠torproject.org 10 Feb '15

10 Feb '15

commit d0759da14eeaefb186d8d514f971b0b1a0618a0f Author: teor <teor2345(a)gmail.com> Date: Sun Feb 8 23:41:37 2015 +1100 Avoid calling SMARTLIST_FOREACH on a NULL smartlist in tests Check if each smartlist is NULL before calling SMARTLIST_FOREACH on it. Bug discovered by the clang static analyzer. Apple clang 600.0.56 (LLVM 3.5svn) on x86_64-apple-darwin14.1.0. --- src/test/test_address.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index f98cc12..7f7347f 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -207,9 +207,10 @@ test_address_ifaddrs_to_smartlist(void *arg) tor_free(ifa_ipv4); tor_free(ifa_ipv6); tor_free(sockaddr_to_check); - SMARTLIST_FOREACH(smartlist, tor_addr_t *, t, tor_free(t)); - smartlist_free(smartlist); - + if (smartlist) { + SMARTLIST_FOREACH(smartlist, tor_addr_t *, t, tor_free(t)); + smartlist_free(smartlist); + } return; } @@ -442,8 +443,10 @@ test_address_get_if_addrs_ioctl(void *arg) tt_assert(smartlist_contains_localhost_tor_addr(result)); done: - SMARTLIST_FOREACH(result, tor_addr_t *, t, tor_free(t)); - smartlist_free(result); + if (result) { + SMARTLIST_FOREACH(result, tor_addr_t *, t, tor_free(t)); + smartlist_free(result); + } return; }

1 0

[tor/master] Merge remote-tracking branch 'teor/avoid-NULL-smartlist-foreach'
by nickm＠torproject.org 10 Feb '15

10 Feb '15

commit f4c0735933699d899bd31c4e938862bcec7fd64c Merge: 9667b2b d0759da Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 9 22:35:40 2015 -0800 Merge remote-tracking branch 'teor/avoid-NULL-smartlist-foreach' src/test/test_address.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)

1 0

[stem/master] Fix a doc typo
by atagar＠torproject.org 10 Feb '15

10 Feb '15

commit 337c27ca707fc3087cb061c32b9832279040a6fb Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Feb 9 20:32:13 2015 +0100 Fix a doc typo --- docs/faq.rst | 2 +- stem/util/connection.py | 2 +- test/unit/util/connection.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/faq.rst b/docs/faq.rst index 08781be..3fc6166 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -397,7 +397,7 @@ the following... with Controller.from_port(port = 9051) as controller: # do my stuff -... is equivialnt to... +... is equivalent to... .. code-block:: python diff --git a/stem/util/connection.py b/stem/util/connection.py index a7b979a..200699a 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -260,7 +260,7 @@ def system_resolvers(system = None): elif system in ('Darwin', 'OpenBSD'): resolvers = [Resolver.LSOF] elif system == 'FreeBSD': - # Netstat is available, but lacks a '-p' equivilant so we can't associate + # Netstat is available, but lacks a '-p' equivalent so we can't associate # the results to processes. The platform also has a ss command, but it # belongs to a spreadsheet application. diff --git a/test/unit/util/connection.py b/test/unit/util/connection.py index 582e747..b6995d0 100644 --- a/test/unit/util/connection.py +++ b/test/unit/util/connection.py @@ -124,7 +124,7 @@ class TestConnection(unittest.TestCase): proc_mock.return_value = True self.assertEqual([Resolver.PROC, Resolver.NETSTAT, Resolver.SOCKSTAT, Resolver.LSOF, Resolver.SS], stem.util.connection.system_resolvers('Linux')) - # check that calling without an argument is equivilant to calling for this + # check that calling without an argument is equivalent to calling for this # platform self.assertEqual(stem.util.connection.system_resolvers(platform.system()), stem.util.connection.system_resolvers())

1 0

[stem/master] Fix system resolved test on platforms without proc
by atagar＠torproject.org 10 Feb '15

10 Feb '15

commit 9d644f4c18e8ec7a43591fdc2a8a140fad44571a Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Feb 9 20:59:50 2015 +0100 Fix system resolved test on platforms without proc This was broken when a hack was introduced for Gentoo in commit 500fd38a7d09e883257d84dd67bc7014f4f47085. --- test/unit/util/connection.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/unit/util/connection.py b/test/unit/util/connection.py index b6995d0..731fa5b 100644 --- a/test/unit/util/connection.py +++ b/test/unit/util/connection.py @@ -105,15 +105,17 @@ BSD_PROCSTAT_OUTPUT = """\ class TestConnection(unittest.TestCase): + @patch('os.access') @patch('stem.util.system.is_available') @patch('stem.util.proc.is_available') - def test_system_resolvers(self, proc_mock, is_available_mock): + def test_system_resolvers(self, proc_mock, is_available_mock, os_mock): """ Checks the system_resolvers function. """ is_available_mock.return_value = True proc_mock.return_value = False + os_mock.return_value = True self.assertEqual([], stem.util.connection.system_resolvers('Windows')) self.assertEqual([Resolver.LSOF], stem.util.connection.system_resolvers('Darwin'))

1 0

[stem/master] Resolve www.torproject.org instead of hardcoding
by atagar＠torproject.org 10 Feb '15

10 Feb '15

commit e72adf711185e975e5828cc4147b419b900b6536 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Feb 9 21:30:36 2015 +0100 Resolve www.torproject.org instead of hardcoding This led to a test failure because the IP changed. --- test/integ/control/controller.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 6ec03a0..055955d 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -898,7 +898,7 @@ class TestController(unittest.TestCase): elif test.runner.require_online(self): return - host = '38.229.72.14' # www.torproject.org + host = socket.gethostbyname('www.torproject.org') port = 443 runner = test.runner.get_runner() @@ -1173,7 +1173,7 @@ class TestController(unittest.TestCase): elif test.runner.require_version(self, Requirement.EXTENDCIRCUIT_PATH_OPTIONAL): return - host = '38.229.72.14' # www.torproject.org + host = socket.gethostbyname('www.torproject.org') port = 80 circuit_id, streams = None, []

1 0

[stem/master] Gabelmoo's IP address changed
by atagar＠torproject.org 10 Feb '15

10 Feb '15

commit 356600f1c49dd02bf925f296104ffe708a80ec9e Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Feb 9 20:17:14 2015 +0100 Gabelmoo's IP address changed --- docs/tutorials/examples/votes_by_bandwidth_authorities.rst | 2 +- test/unit/descriptor/networkstatus/directory_authority.py | 6 +++--- test/unit/descriptor/networkstatus/document_v3.py | 2 +- test/unit/tutorial_examples.py | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/tutorials/examples/votes_by_bandwidth_authorities.rst b/docs/tutorials/examples/votes_by_bandwidth_authorities.rst index 4e7aa00..c413c96 100644 --- a/docs/tutorials/examples/votes_by_bandwidth_authorities.rst +++ b/docs/tutorials/examples/votes_by_bandwidth_authorities.rst @@ -51,7 +51,7 @@ gets their current votes then prints how many relays it had a measurement for. :: % python bandwidth_auth_measured_counts.py - Getting gabelmoo's vote from http://212.112.245.170:80/tor/status-vote/current/authority: + Getting gabelmoo's vote from http://131.188.40.189:80/tor/status-vote/current/authority: 5935 measured entries and 1332 unmeasured Getting tor26's vote from http://86.59.21.38:80/tor/status-vote/current/authority: 5735 measured entries and 1690 unmeasured diff --git a/test/unit/descriptor/networkstatus/directory_authority.py b/test/unit/descriptor/networkstatus/directory_authority.py index 0c44a1e..c1dc319 100644 --- a/test/unit/descriptor/networkstatus/directory_authority.py +++ b/test/unit/descriptor/networkstatus/directory_authority.py @@ -62,13 +62,13 @@ class TestDirectoryAuthority(unittest.TestCase): Parses an authority using the '-legacy' format. """ - content = 'dir-source gabelmoo-legacy 81349FC1F2DBA2C2C11B45CB9706637D480AB913 212.112.245.170 212.112.245.170 80 443' + content = 'dir-source gabelmoo-legacy 81349FC1F2DBA2C2C11B45CB9706637D480AB913 131.188.40.189 131.188.40.189 80 443' authority = DirectoryAuthority(content, is_vote = False) self.assertEqual('gabelmoo-legacy', authority.nickname) self.assertEqual('81349FC1F2DBA2C2C11B45CB9706637D480AB913', authority.fingerprint) - self.assertEqual('212.112.245.170', authority.hostname) - self.assertEqual('212.112.245.170', authority.address) + self.assertEqual('131.188.40.189', authority.hostname) + self.assertEqual('131.188.40.189', authority.address) self.assertEqual(80, authority.dir_port) self.assertEqual(443, authority.or_port) self.assertEqual(True, authority.is_legacy) diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index 3ed7fbe..2f847d7 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -1136,7 +1136,7 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= Includes both normal authorities and those following the '-legacy' format. """ - legacy_content = 'dir-source gabelmoo-legacy 81349FC1F2DBA2C2C11B45CB9706637D480AB913 212.112.245.170 212.112.245.170 80 443' + legacy_content = 'dir-source gabelmoo-legacy 81349FC1F2DBA2C2C11B45CB9706637D480AB913 131.188.40.189 131.188.40.189 80 443' authority1 = get_directory_authority({'contact': 'doctor jekyll'}, is_vote = False) authority2 = DirectoryAuthority(legacy_content, validate = True, is_vote = False) diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index 10d80dd..2985281 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -90,7 +90,7 @@ moria1 has the Running flag but maatuska doesn't: DCAEC3D069DC39AAE43D13C8AF31B5 """ VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT = """\ -Getting gabelmoo's vote from http://212.112.245.170:80/tor/status-vote/current/authority: +Getting gabelmoo's vote from http://131.188.40.189:80/tor/status-vote/current/authority: 5935 measured entries and 1332 unmeasured Getting tor26's vote from http://86.59.21.38:80/tor/status-vote/current/authority: 5735 measured entries and 1690 unmeasured @@ -408,14 +408,14 @@ class TestTutorialExamples(unittest.TestCase): DIRECTORY_AUTHORITIES['maatuska'], ] - directory_values[0].address = '212.112.245.170' + directory_values[0].address = '131.188.40.189' get_authorities_mock().values.return_value = directory_values entry_with_measurement = get_router_status_entry_v3({'w': 'Bandwidth=1 Measured=1'}) entry_without_measurement = get_router_status_entry_v3() query1 = Mock() - query1.download_url = 'http://212.112.245.170:80/tor/status-vote/current/authority' + query1.download_url = 'http://131.188.40.189:80/tor/status-vote/current/authority' query1.run.return_value = [entry_with_measurement] * 5935 + [entry_without_measurement] * 1332 query2 = Mock()

1 0

[webwml/master] Fix osx gpg instructions (#12563)
by sebastian＠torproject.org 09 Feb '15

09 Feb '15

commit dfef746338aeb274bcd24e1e478e07bebd108eff Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Feb 9 22:52:42 2015 +0100 Fix osx gpg instructions (#12563) --- docs/en/verifying-signatures.wml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml index 856e01c..430e5e8 100644 --- a/docs/en/verifying-signatures.wml +++ b/docs/en/verifying-signatures.wml @@ -137,7 +137,7 @@ to download the ".asc" file as well. Assuming you downloaded the package and its signature to your Desktop, run: - <pre>gpg --verify /Users/Alice/TorBrowser-<version-torbrowserbundleosx32>-osx32_en-US.dmg{.asc*,}</pre> + <pre>gpg --verify ~/Desktop/TorBrowser-<version-torbrowserbundleosx32>-osx32_en-US.dmg{.asc*,}</pre> The output should say "Good signature": @@ -220,7 +220,7 @@ Windows you can use the <a href="http://md5deep.sourceforge.net/"> hashdeep utility</a> and run <pre>C:\location\where\you\saved\hashdeep -c sha256sum <TOR BROWSER FILE NAME>.exe</pre> - On Mac or Linux you can run <pre>sha256sum <TOR BROWSER FILE NAME>.zip</pre> or <pre>sha256sum <TOR BROWSER FILE NAME>.tar.gz</pre> without having to download a utility.</li> + On Mac or Linux you can run <pre>sha256sum <TOR BROWSER FILE NAME>.dmg</pre> or <pre>sha256sum <TOR BROWSER FILE NAME>.tar.gz</pre> without having to download a utility.</li> <li>You will see a string of letters and numbers.</li> <li>Open sha256sums.txt in a text editor.</li> <li>Locate the name of the Tor Browser file you downloaded.</li>

1 0