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

[sbws/master] destination: remove unused code
by juga＠torproject.org 27 Feb '19

27 Feb '19

commit 883307ba52088f92a514b34cd16e8f3c156c2123 Author: juga0 <juga(a)riseup.net> Date: Sat Dec 22 09:18:57 2018 +0000 destination: remove unused code --- sbws/lib/destination.py | 75 -------------------------- tests/integration/lib/test_destination.py | 4 -- tests/integration/lib/test_relayprioritizer.py | 1 - 3 files changed, 80 deletions(-) diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py index 302ac3f..e1be0bb 100644 --- a/sbws/lib/destination.py +++ b/sbws/lib/destination.py @@ -1,15 +1,11 @@ import logging import random -import time -import os -from threading import RLock import requests from urllib.parse import urlparse from stem.control import EventType from sbws.globals import DESTINATION_VERIFY_CERTIFICATE import sbws.util.stem as stem_utils -import sbws.util.requests as requests_utils from ..globals import MAXIMUM_NUMBER_DESTINATION_FAILURES @@ -153,17 +149,6 @@ class Destination: self.consecutive_failures += 1 self.failed = True - def is_usable(self, circ_id, session, cont): - ''' Use **connect_to_destination_over_circuit** to determine if this - destination is usable and return what it returns. Just a small wrapper. - ''' - if not isinstance(self.verify, bool): - if not os.path.isfile(self.verify): - return False, '{} is believed to be a CA bundle file on disk '\ - 'but it does not exist'.format(self.verify) - return connect_to_destination_over_circuit( - self, circ_id, session, cont, self._max_dl) - @property def url(self): return self._url.geturl() @@ -208,71 +193,11 @@ class DestinationList: self._cb = circuit_builder self._rl = relay_list self._all_dests = dests - # Inially all destionations are usable until proven otherwise. - self._usable_dests = self._all_dests - self._last_usability_test = 0 - self._usability_test_interval = \ - conf.getint('destinations', 'usability_test_interval') - self._usability_test_timeout = \ - conf.getfloat('general', 'http_timeout') - self._usability_lock = RLock() @property def functional_destinations(self): return [d for d in self._all_dests if d.is_functional] - def _should_perform_usability_test(self): - # Until bigger refactor, do not perform usability test. - # Every time a measurement is done, it already performs what usability - # test does. - return False - - def _perform_usability_test(self): - self._usability_lock.acquire() - log.debug('Perform usability tests') - cont = self._cont - timeout = self._usability_test_timeout - session = requests_utils.make_session(cont, timeout) - usable_dests = [] - for dest in self._all_dests: - possible_exits = self._rl.exits_not_bad_allowing_port(dest.port) - # Keep the fastest 10% of exits, or 3, whichever is larger - num_keep = int(max(3, len(possible_exits) * 0.1)) - possible_exits = sorted( - possible_exits, key=lambda e: e.consensus_bandwidth, - reverse=True) - exits = possible_exits[0:num_keep] - if len(exits) < 1: - log.warning("There are no exits to perform usability tests.") - continue - # Try three times to build a circuit to test this destination - circ_id = None - for _ in range(0, 3): - # Pick a random exit - exit = self._rng.choice(exits) - circ_id, reason = \ - self._cb.build_circuit([None, exit.fingerprint]) - if circ_id: - break - if not circ_id: - log.warning('Unable to build a circuit to test the usability ' - 'of %s, %s', dest.url, reason) - continue - log.debug('Built circ %s %s to test usability of %s', circ_id, - stem_utils.circuit_str(cont, circ_id), dest.url) - is_usable, data = dest.is_usable(circ_id, session, cont) - if not is_usable: - log.warning(data) - self._cb.close_circuit(circ_id) - continue - assert is_usable - log.debug('%s seems usable so we will keep it', dest.url) - usable_dests.append(dest) - self._cb.close_circuit(circ_id) - self._usable_dests = usable_dests - self._last_usability_test = time.time() - self._usability_lock.release() - @staticmethod def from_config(conf, circuit_builder, relay_list, controller): assert 'destinations' in conf diff --git a/tests/integration/lib/test_destination.py b/tests/integration/lib/test_destination.py index 44a8631..cc8c794 100644 --- a/tests/integration/lib/test_destination.py +++ b/tests/integration/lib/test_destination.py @@ -13,10 +13,6 @@ def test_destination_list_no_usability_test_success( destination_list, error_msg = DestinationList.from_config( conf, cb, rl, persistent_launch_tor ) - # Initially all destinations should be "usable". - assert destination_list._all_dests == destination_list._usable_dests - # Because this is disabled. - assert destination_list._should_perform_usability_test() is False # Because there's only 1 destination in conftest, random should return # the same one. assert destination_list.next() == \ diff --git a/tests/integration/lib/test_relayprioritizer.py b/tests/integration/lib/test_relayprioritizer.py index 60e3405..76c5969 100644 --- a/tests/integration/lib/test_relayprioritizer.py +++ b/tests/integration/lib/test_relayprioritizer.py @@ -14,7 +14,6 @@ def static_time(value): def _build_result_for_relay(conf, rl, result_type, relay_nick, timestamp): relay = [r for r in rl.relays if r.nickname == relay_nick] - print(rl.relays) assert len(relay) == 1 relay = relay[0] other = [r for r in rl.relays if r.nickname != relay_nick][0]

1 0

[sbws/master] destination: stop running twice usability tests
by juga＠torproject.org 27 Feb '19

27 Feb '19

commit d33ac8f6d23b8b30664311b205a87d9a55e4c1d1 Author: juga0 <juga(a)riseup.net> Date: Tue Dec 18 11:33:54 2018 +0000 destination: stop running twice usability tests in every measurement. This removes the need for an extra lock for every measurement It should also not be depending on a time interval, but on the number of failures detected. Not counting number of failures since it would need to modify the destination or list of at runtime. It should be done in a future refactor. Fixes bug #28897. Bugfix v0.3.0 --- sbws/core/scanner.py | 9 +++-- sbws/lib/destination.py | 36 +++++++----------- tests/integration/lib/test_destination.py | 61 +++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 27 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index 78cc165..dd4198c 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -11,7 +11,8 @@ from ..lib.resultdump import ResultSuccess, ResultErrorCircuit from ..lib.resultdump import ResultErrorStream from ..lib.relaylist import RelayList from ..lib.relayprioritizer import RelayPrioritizer -from ..lib.destination import DestinationList +from ..lib.destination import (DestinationList, + connect_to_destination_over_circuit) from ..util.timestamp import now_isodt_str from ..util.state import State from sbws.globals import fail_hard, HTTP_GET_HEADERS, TIMEOUT_MEASUREMENTS @@ -284,9 +285,9 @@ def measure_relay(args, conf, destinations, cb, rl, relay): ] log.debug('Built circuit with path %s (%s) to measure %s (%s)', circ_fps, nicknames, relay.fingerprint, relay.nickname) - # Make a connection to the destionation webserver and make sure it can - # still help us measure - is_usable, usable_data = dest.is_usable(circ_id, s, cb.controller) + # Make a connection to the destination + is_usable, usable_data = connect_to_destination_over_circuit( + dest, circ_id, s, cb.controller, dest._max_dl) if not is_usable: log.debug('Destination %s unusable via circuit %s (%s), %s', dest.url, circ_fps, nicknames, usable_data) diff --git a/sbws/lib/destination.py b/sbws/lib/destination.py index 7bd64e8..468b3f6 100644 --- a/sbws/lib/destination.py +++ b/sbws/lib/destination.py @@ -163,7 +163,8 @@ class DestinationList: self._cb = circuit_builder self._rl = relay_list self._all_dests = dests - self._usable_dests = [] + # Inially all destionations are usable until proven otherwise. + self._usable_dests = self._all_dests self._last_usability_test = 0 self._usability_test_interval = \ conf.getint('destinations', 'usability_test_interval') @@ -172,8 +173,10 @@ class DestinationList: self._usability_lock = RLock() def _should_perform_usability_test(self): - return self._last_usability_test + self._usability_test_interval <\ - time.time() + # Until bigger refactor, do not perform usability test. + # Every time a measurement is done, it already performs what usability + # test does. + return False def _perform_usability_test(self): self._usability_lock.acquire() @@ -250,23 +253,10 @@ class DestinationList: ''' Returns the next destination that should be used in a measurement ''' - with self._usability_lock: - while True: - if self._should_perform_usability_test(): - self._perform_usability_test() - log.debug('%s/%s of our configured destinations are ' - 'usable at this time', len(self._usable_dests), - len(self._all_dests)) - if len(self._usable_dests) > 0: - break - time_till_next_check = self._usability_test_interval + 0.0001 - log.warning( - 'Of our %d configured destinations, none are usable at ' - 'this time. Sleeping %f seconds on this blocking call ' - 'to DestinationList.next() until we can check for a ' - 'usable destination again.', len(self._all_dests), - time_till_next_check) - time.sleep(time_till_next_check) - - self._rng.shuffle(self._usable_dests) - return self._usable_dests[0] + # Do not perform usability tests since a destination is already proven + # usable or not in every measurement, and it should depend on a X + # number of failures. + # This removes the need for an extra lock for every measurement. + # Do not change the order of the destinations, just return a + # destination. + return self._rng.choice(self._usable_dests) diff --git a/tests/integration/lib/test_destination.py b/tests/integration/lib/test_destination.py new file mode 100644 index 0000000..53c0ab5 --- /dev/null +++ b/tests/integration/lib/test_destination.py @@ -0,0 +1,61 @@ +"""Integration tests for destination.py""" +import sbws.util.requests as requests_utils +from sbws.lib.destination import (DestinationList, Destination, + connect_to_destination_over_circuit) + + +def test_destination_list_no_usability_test_success( + conf, persistent_launch_tor, cb, rl + ): + # In a future refactor, if DestionationList is not initialized with the + # controller, this test should be an unit test. + destination_list, error_msg = DestinationList.from_config( + conf, cb, rl, persistent_launch_tor + ) + # Initially all destinations should be "usable". + assert destination_list._all_dests == destination_list._usable_dests + # Because this is disabled. + assert destination_list._should_perform_usability_test() is False + # Because there's only 1 destination in conftest, random should return + # the same one. + assert destination_list.next() == \ + destination_list._all_dests[0] + + +def test_connect_to_destination_over_circuit_success(persistent_launch_tor, + dests, cb, rl): + destination = dests.next() + session = requests_utils.make_session(persistent_launch_tor, 10) + # Choose a relay that is not an exit + relay = [r for r in rl.relays + if r.nickname == 'relay1mbyteMAB'][0] + # Choose an exit, for this test it does not matter the bandwidth + helper = rl.exits_not_bad_allowing_port(destination.port)[0] + circuit_path = [relay.fingerprint, helper.fingerprint] + # build a circuit + circuit_id = cb.build_circuit(circuit_path) + # Perform "usability test" + is_usable, response = connect_to_destination_over_circuit( + destination, circuit_id, session, persistent_launch_tor, 1024) + assert is_usable is True + assert 'content_length' in response + + +def test_connect_to_destination_over_circuit_fail(persistent_launch_tor, + dests, cb, rl): + bad_destination = Destination('https://example.example', 1024, False) + # dests._all_dests.append(bad_destination) + # dests._usable_dests.append(bad_destination) + session = requests_utils.make_session(persistent_launch_tor, 10) + # Choose a relay that is not an exit + relay = [r for r in rl.relays + if r.nickname == 'relay1mbyteMAB'][0] + # Choose an exit, for this test it does not matter the bandwidth + helper = rl.exits_not_bad_allowing_port(bad_destination.port)[0] + circuit_path = [relay.fingerprint, helper.fingerprint] + # Build a circuit. + circuit_id = cb.build_circuit(circuit_path) + # Perform "usability test" + is_usable, response = connect_to_destination_over_circuit( + bad_destination, circuit_id, session, persistent_launch_tor, 1024) + assert is_usable is False

1 0

[sbws/master] tests: CB.build_circuit now returns a tuple
by juga＠torproject.org 27 Feb '19

27 Feb '19

commit 54c5db04318cb3c7c5e72e8a2767ed6905ff993a Author: juga0 <juga(a)riseup.net> Date: Thu Feb 21 16:43:08 2019 +0000 tests: CB.build_circuit now returns a tuple Change tests added in #28897 with the changes introduced in #28736. --- tests/integration/lib/test_destination.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/lib/test_destination.py b/tests/integration/lib/test_destination.py index cc8c794..54cbacc 100644 --- a/tests/integration/lib/test_destination.py +++ b/tests/integration/lib/test_destination.py @@ -30,7 +30,7 @@ def test_connect_to_destination_over_circuit_success(persistent_launch_tor, helper = rl.exits_not_bad_allowing_port(destination.port)[0] circuit_path = [relay.fingerprint, helper.fingerprint] # build a circuit - circuit_id = cb.build_circuit(circuit_path) + circuit_id, _ = cb.build_circuit(circuit_path) # Perform "usability test" is_usable, response = connect_to_destination_over_circuit( destination, circuit_id, session, persistent_launch_tor, 1024) @@ -54,7 +54,7 @@ def test_connect_to_destination_over_circuit_fail(persistent_launch_tor, helper = rl.exits_not_bad_allowing_port(bad_destination.port)[0] circuit_path = [relay.fingerprint, helper.fingerprint] # Build a circuit. - circuit_id = cb.build_circuit(circuit_path) + circuit_id, _ = cb.build_circuit(circuit_path) # Perform "usability test" is_usable, response = connect_to_destination_over_circuit( bad_destination, circuit_id, session, persistent_launch_tor, 1024)

1 0

[sbws/master] scanner: stop threads when there're not destinations
by juga＠torproject.org 27 Feb '19

27 Feb '19

commit 3fe64b06253f9342e627c5d4b9db065cd03a8a7e Author: juga0 <juga(a)riseup.net> Date: Tue Feb 26 10:48:38 2019 +0000 scanner: stop threads when there're not destinations Exit the scanner with error stoping threads first when there is not any functional destination, since the destinations can not be recovered. After merging #28897, `stop_threads` can be used (instroduced in #28869). --- sbws/core/scanner.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index 4e981fd..00071be 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -37,7 +37,7 @@ rd = None controller = None -def stop_threads(signal, frame): +def stop_threads(signal, frame, exit_code=0): global rd, pool log.debug('Stopping sbws.') # Avoid new threads to start. @@ -49,7 +49,7 @@ def stop_threads(signal, frame): rd.thread.join() # Stop Tor thread controller.close() - sys.exit(0) + sys.exit(exit_code) signal.signal(signal.SIGTERM, stop_threads) @@ -247,11 +247,12 @@ def measure_relay(args, conf, destinations, cb, rl, relay): # If there is no any destination at this point, it can not continue. if not dest: # XXX: this should return a ResultError + # instead of stopping the scanner once a destination can be recovered. log.critical("There are not any functional destinations.\n" "It is recommended to set several destinations so that " "the scanner can continue if one fails.") - # This should raise an error so that the caller can close the pool. - exit(1) + # Exit the scanner with error stopping threads first. + stop_threads(signal.SIGTERM, None, 1) # Pick a relay to help us measure the given relay. If the given relay is an # exit, then pick a non-exit. Otherwise pick an exit. helper = None

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 27 Feb '19

27 Feb '19

commit 5ef942910cecb16d7df50d65043b8ecf300ee595 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 27 04:16:03 2019 +0000 Update translations for liveusb-creator_completed --- tr/tr.po | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index 4a4b0125e..7e0b6fb79 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-02 09:26+0100\n" -"PO-Revision-Date: 2019-01-03 09:52+0000\n" +"POT-Creation-Date: 2019-02-24 07:24+0100\n" +"PO-Revision-Date: 2019-02-27 04:14+0000\n" "Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -320,14 +320,17 @@ msgid "Tails Installer" msgstr "Tails Kurucu" #: ../tails_installer/gui.py:441 -msgid "Tails Installer is deprecated" -msgstr "Tails kurucu kullanımdan kaldırıldı" +msgid "Tails Installer is deprecated in Debian" +msgstr "Tails kurucusu Debian üzerinde kullanımdan kaldırıldı" #: ../tails_installer/gui.py:443 msgid "" -"To install a new Tails, see the <a href='https://tails.boum.org/install/'>installation documentation</a>.\n" -"To upgrade an existing Tails, see the <a href='https://tails.boum.org/upgrade/'>upgrade documentation</a>." -msgstr "Yeni bir Tails kurulumu yapmak için <a href='https://tails.boum.org/install/'>kurulum belgelerine</a> bakabilirsiniz.\nVar olan Tails kurulumunu güncellemek için <a href='https://tails.boum.org/upgrade/'>güncelleme belgelerine</a> bakabilirsiniz." +"To install Tails from scratch, use GNOME Disks instead.\n" +"<a href='https://tails.boum.org/install/linux/usb-overview'>See the installation instructions</a>\n" +"\n" +"To upgrade Tails, do an automatic upgrade from Tails or a manual upgrade from Debian using a second USB stick.\n" +"<a href='https://tails.boum.org/upgrade/tails-overview'>See the manual upgrade instructions</a>" +msgstr "Yeni bir Tails kurulumu yapmak için GNOME disklerini kullanabilirsiniz.\n<a href='https://tails.boum.org/install/linux/usb-overview'>Kurulum belgelerine</a> bakın.\n\nVar olan Tails kurulumunu Tails içinden otomatik güncellemeyi çalıştırarak ya da Debian üzerinde ikinci bir USB disk kullanarak el ile güncelleyebilirsiniz. \n<a href='https://tails.boum.org/upgrade/tails-overview'>El ile güncelleme belgelerine</a> bakın." #: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" @@ -488,16 +491,16 @@ msgstr "Seçilmiş dosya kullanılamadı. ISO kalıbını diskinizin kök klasö msgid "%(filename)s selected" msgstr "%(filename)s seçildi" -#: ../tails_installer/source.py:28 +#: ../tails_installer/source.py:29 msgid "Unable to find LiveOS on ISO" msgstr "ISO üzerinde Canlı İşletim Sistemi bulunamadı" -#: ../tails_installer/source.py:34 +#: ../tails_installer/source.py:35 #, python-format msgid "Could not guess underlying block device: %s" msgstr "Temel blok aygıtı öngörülemedi: %s" -#: ../tails_installer/source.py:49 +#: ../tails_installer/source.py:50 #, python-format msgid "" "There was a problem executing `%s`.\n" @@ -505,29 +508,29 @@ msgid "" "%s" msgstr "`%s` çalıştırılırken bir sorun çıktı.\n%s\n%s" -#: ../tails_installer/source.py:63 +#: ../tails_installer/source.py:64 #, python-format msgid "'%s' does not exist" msgstr "'%s' bulunamadı" -#: ../tails_installer/source.py:65 +#: ../tails_installer/source.py:66 #, python-format msgid "'%s' is not a directory" msgstr "'%s' bir klasör değil" -#: ../tails_installer/source.py:75 +#: ../tails_installer/source.py:76 #, python-format msgid "Skipping '%(filename)s'" msgstr "'%(filename)s' atlanıyor" -#: ../tails_installer/utils.py:44 +#: ../tails_installer/utils.py:55 #, python-format msgid "" "There was a problem executing `%s`.%s\n" "%s" msgstr "`%s` çalıştırılırken bir sorun çıktı.%s\n%s" -#: ../tails_installer/utils.py:124 +#: ../tails_installer/utils.py:135 msgid "Could not open device for writing." msgstr "Aygıt yazılmak üzere açılamadı."

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 27 Feb '19

27 Feb '19

commit db919931af8271916ee15a50e282879ef207cfe7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 27 04:15:55 2019 +0000 Update translations for liveusb-creator --- tr/tr.po | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index 28a1eb56c..7e0b6fb79 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -21,9 +21,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-23 13:30+0100\n" -"PO-Revision-Date: 2019-02-23 13:05+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2019-02-24 07:24+0100\n" +"PO-Revision-Date: 2019-02-27 04:14+0000\n" +"Last-Translator: Kaya Zeren <kayazeren(a)gmail.com>\n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -321,7 +321,7 @@ msgstr "Tails Kurucu" #: ../tails_installer/gui.py:441 msgid "Tails Installer is deprecated in Debian" -msgstr "" +msgstr "Tails kurucusu Debian üzerinde kullanımdan kaldırıldı" #: ../tails_installer/gui.py:443 msgid "" @@ -330,7 +330,7 @@ msgid "" "\n" "To upgrade Tails, do an automatic upgrade from Tails or a manual upgrade from Debian using a second USB stick.\n" "<a href='https://tails.boum.org/upgrade/tails-overview'>See the manual upgrade instructions</a>" -msgstr "" +msgstr "Yeni bir Tails kurulumu yapmak için GNOME disklerini kullanabilirsiniz.\n<a href='https://tails.boum.org/install/linux/usb-overview'>Kurulum belgelerine</a> bakın.\n\nVar olan Tails kurulumunu Tails içinden otomatik güncellemeyi çalıştırarak ya da Debian üzerinde ikinci bir USB disk kullanarak el ile güncelleyebilirsiniz. \n<a href='https://tails.boum.org/upgrade/tails-overview'>El ile güncelleme belgelerine</a> bakın." #: ../tails_installer/gui.py:450 ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" @@ -491,16 +491,16 @@ msgstr "Seçilmiş dosya kullanılamadı. ISO kalıbını diskinizin kök klasö msgid "%(filename)s selected" msgstr "%(filename)s seçildi" -#: ../tails_installer/source.py:28 +#: ../tails_installer/source.py:29 msgid "Unable to find LiveOS on ISO" msgstr "ISO üzerinde Canlı İşletim Sistemi bulunamadı" -#: ../tails_installer/source.py:34 +#: ../tails_installer/source.py:35 #, python-format msgid "Could not guess underlying block device: %s" msgstr "Temel blok aygıtı öngörülemedi: %s" -#: ../tails_installer/source.py:49 +#: ../tails_installer/source.py:50 #, python-format msgid "" "There was a problem executing `%s`.\n" @@ -508,29 +508,29 @@ msgid "" "%s" msgstr "`%s` çalıştırılırken bir sorun çıktı.\n%s\n%s" -#: ../tails_installer/source.py:63 +#: ../tails_installer/source.py:64 #, python-format msgid "'%s' does not exist" msgstr "'%s' bulunamadı" -#: ../tails_installer/source.py:65 +#: ../tails_installer/source.py:66 #, python-format msgid "'%s' is not a directory" msgstr "'%s' bir klasör değil" -#: ../tails_installer/source.py:75 +#: ../tails_installer/source.py:76 #, python-format msgid "Skipping '%(filename)s'" msgstr "'%(filename)s' atlanıyor" -#: ../tails_installer/utils.py:44 +#: ../tails_installer/utils.py:55 #, python-format msgid "" "There was a problem executing `%s`.%s\n" "%s" msgstr "`%s` çalıştırılırken bir sorun çıktı.%s\n%s" -#: ../tails_installer/utils.py:124 +#: ../tails_installer/utils.py:135 msgid "Could not open device for writing." msgstr "Aygıt yazılmak üzere açılamadı."

1 0

[tor/maint-0.3.3] Fix a compiler warning on OpenBSD
by teor＠torproject.org 26 Feb '19

26 Feb '19

commit 4417ac880a7f1306574365fd9cf4da2a41ac14ef Author: Kris Katterjohn <katterjohn(a)gmail.com> Date: Mon Jan 21 16:33:32 2019 -0600 Fix a compiler warning on OpenBSD malloc_options needs to be declared extern (and declaring it extern means we need to initialize it separately) Fixes bug 29145; bugfix on 0.2.9.3-alpha Signed-off-by: Kris Katterjohn <katterjohn(a)gmail.com> --- changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug29145 b/changes/bug29145 new file mode 100644 index 000000000..40d3da4b9 --- /dev/null +++ b/changes/bug29145 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation, testing): + - Silence a compiler warning in test-memwipe.c on OpenBSD. Fixes + bug 29145; bugfix on 0.2.9.3-alpha. Patch from Kris Katterjohn. diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index fd6457416..c650b99c8 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -39,7 +39,8 @@ const char *s = NULL; #ifdef __OpenBSD__ /* Disable some of OpenBSD's malloc protections for this test. This helps * us do bad things, such as access freed buffers, without crashing. */ -const char *malloc_options="sufjj"; +extern const char *malloc_options; +const char *malloc_options = "sufjj"; #endif static unsigned

1 0

[tor/maint-0.2.9] Fix a compiler warning on OpenBSD
by teor＠torproject.org 26 Feb '19

26 Feb '19

commit 4417ac880a7f1306574365fd9cf4da2a41ac14ef Author: Kris Katterjohn <katterjohn(a)gmail.com> Date: Mon Jan 21 16:33:32 2019 -0600 Fix a compiler warning on OpenBSD malloc_options needs to be declared extern (and declaring it extern means we need to initialize it separately) Fixes bug 29145; bugfix on 0.2.9.3-alpha Signed-off-by: Kris Katterjohn <katterjohn(a)gmail.com> --- changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug29145 b/changes/bug29145 new file mode 100644 index 000000000..40d3da4b9 --- /dev/null +++ b/changes/bug29145 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation, testing): + - Silence a compiler warning in test-memwipe.c on OpenBSD. Fixes + bug 29145; bugfix on 0.2.9.3-alpha. Patch from Kris Katterjohn. diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index fd6457416..c650b99c8 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -39,7 +39,8 @@ const char *s = NULL; #ifdef __OpenBSD__ /* Disable some of OpenBSD's malloc protections for this test. This helps * us do bad things, such as access freed buffers, without crashing. */ -const char *malloc_options="sufjj"; +extern const char *malloc_options; +const char *malloc_options = "sufjj"; #endif static unsigned

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.3
by teor＠torproject.org 26 Feb '19

26 Feb '19

commit 6c966b894c2115d18ad5aecc7d02e7b96fea1daf Merge: fb309f6eb 4417ac880 Author: teor <teor(a)torproject.org> Date: Wed Feb 27 09:37:36 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/test/test-memwipe.c index 89d946d50,c650b99c8..4beb61369 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@@ -39,10 -36,11 +39,11 @@@ const char *s = NULL sum += (unsigned char)buf[i]; \ } -#ifdef __OpenBSD__ +#ifdef OpenBSD /* Disable some of OpenBSD's malloc protections for this test. This helps * us do bad things, such as access freed buffers, without crashing. */ - const char *malloc_options="sufjj"; + extern const char *malloc_options; + const char *malloc_options = "sufjj"; #endif static unsigned

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.3
by teor＠torproject.org 26 Feb '19

26 Feb '19

commit 6c966b894c2115d18ad5aecc7d02e7b96fea1daf Merge: fb309f6eb 4417ac880 Author: teor <teor(a)torproject.org> Date: Wed Feb 27 09:37:36 2019 +1000 Merge branch 'maint-0.2.9' into maint-0.3.3 changes/bug29145 | 3 +++ src/test/test-memwipe.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --cc src/test/test-memwipe.c index 89d946d50,c650b99c8..4beb61369 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@@ -39,10 -36,11 +39,11 @@@ const char *s = NULL sum += (unsigned char)buf[i]; \ } -#ifdef __OpenBSD__ +#ifdef OpenBSD /* Disable some of OpenBSD's malloc protections for this test. This helps * us do bad things, such as access freed buffers, without crashing. */ - const char *malloc_options="sufjj"; + extern const char *malloc_options; + const char *malloc_options = "sufjj"; #endif static unsigned

1 0