January 2018 - tor-commits - lists.torproject.org

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 02 Jan '18

02 Jan '18

commit 3f50707c1ec0cf788c67f5217088a8c52ada58f2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 2 17:15:58 2018 +0000 Update translations for liveusb-creator --- th/th.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/th/th.po b/th/th.po index 19b52ee41..1db08126a 100644 --- a/th/th.po +++ b/th/th.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-10 15:57+0100\n" -"PO-Revision-Date: 2018-01-02 15:12+0000\n" +"PO-Revision-Date: 2018-01-02 17:01+0000\n" "Last-Translator: bact' <arthit(a)gmail.com>\n" "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n" "MIME-Version: 1.0\n" @@ -364,7 +364,7 @@ msgstr "" #: ../tails_installer/gui.py:589 msgid "An error happened while installing Tails" -msgstr "" +msgstr "เกิดข้อผิดพลาดระหว่างติดตั้ง Tails" #: ../tails_installer/gui.py:601 msgid "Refreshing releases..."

1 0

[compass/master] Redirect all queries to Relay Search
by karsten＠torproject.org 02 Jan '18

02 Jan '18

commit d66c8e97cad060f9f7479773b29f220ed49638d8 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Tue Nov 28 22:11:35 2017 +0000 Redirect all queries to Relay Search --- app.py | 58 +--------------- static/js/angularize.js | 86 ++++++++++-------------- templates/index.html | 173 ++++++++---------------------------------------- 3 files changed, 65 insertions(+), 252 deletions(-) diff --git a/app.py b/app.py index 8c04292..a25955f 100644 --- a/app.py +++ b/app.py @@ -123,63 +123,7 @@ def index(): @app.route('/result.json', methods=['GET']) def json_result(): - options = Opt(dict(request.args.items())) - - if "TESTING_DATAFILE" in app.config and "TESTING" in app.config: - stats = compass.RelayStats(options,app.config['TESTING_DATAFILE']) - else: - stats = compass.RelayStats(options) - - results = stats.select_relays(stats.relays, options) - - relays = stats.sort_and_reduce(results, - options) - - return Response(json.dumps(relays, cls=ResultEncoder), mimetype='application/json') - -(a)app.route('/result', methods=['GET']) -def result(): - options = Opt() - sort_key = None - relays = [] - - for key, value in request.args.items(): - if key == "top": - try: - options.top = int(value) - except: - options.top = -1 - elif key == "sort": - sort_key = value - elif key in ["country", "ases"]: - if value: - setattr(options, key, [value]) - else: - setattr(options, key, None) - elif key == "exits": - setattr(options, value, True) - else: - setattr(options, key, value) - - stats = compass.RelayStats(options) - sorted_groups = stats.format_and_sort_groups(stats.relays, - by_country=options.by_country, - by_as_number=options.by_as, - links=options.links) - output_string = stats.print_groups(sorted_groups, options.top, - by_country=options.by_country, - by_as_number=options.by_as, - short=None, - links=None) - results = parse(output_string, options.by_country or options.by_as, sort_key) - if sort_key: - for key in sorted(results.iterkeys(), reverse=True): - for value in results[key]: - relays.append(value) - else: - relays = results - - return render_template('result.html', results=relays, grouping=options.by_as or options.by_country) + return jsonify({"error": "The Compass service has been partially shut down. See https://trac.torproject.org/projects/tor/ticket/24445."}) if __name__ == '__main__': # Bind to PORT if defined, otherwise default to 5000. diff --git a/static/js/angularize.js b/static/js/angularize.js index 780e279..2fd04f5 100644 --- a/static/js/angularize.js +++ b/static/js/angularize.js @@ -11,11 +11,6 @@ compassModule.controller('CompassCtrl',function CompassCtrl($scope,$http,$locati $scope.state = "hidden" $scope.query = { - exit_filter:"all_relays", - links:true, - sort:'cw', - sort_reverse: true, - country: null } /** Watch the location bar to allow us to load saved searches **/ @@ -26,59 +21,48 @@ compassModule.controller('CompassCtrl',function CompassCtrl($scope,$http,$locati } }) - /** Make a sorting request - * - * Call 'success_cb' if the request is successful - */ - $scope.ajax_sort = function(sortBy, invert, success_cb) { - $scope.query.sort = sortBy - $scope.query.sort_reverse = invert - - //Update the location bar to track sorting - $location.search($scope.query) - - $http.get('result.json',{"params":$scope.query}) - .success(function(data) { - if (data.results.length > 0) { - $scope.data = data - - if (success_cb !== null){ - success_cb() - } - - $('body').animate({scrollTop:$("div#result_table").offset().top},500) - } - else { - $scope.state = "result_empty" - } - }) - - } - /** Make a data request from the form * * Call 'success_cb' if the request is successful */ $scope.request = function(success_cb) { - $scope.state = 'loading' + var rs_query = ""; + + if ((typeof $scope.query["country"]) !== "undefined" && $scope.query["country"] !== "") { + rs_query += "country:" + $scope.query["country"] + " "; + } + if ((typeof $scope.query["ases"]) !== "undefined" && $scope.query["ases"] !== "") { + rs_query += "as:" + $scope.query["ases"] + " "; + } + if ((typeof $scope.query["family"]) !== "undefined" && $scope.query["family"] !== "") { + rs_query += "family:" + $scope.query["family"] + " "; + } + if ((typeof $scope.query["exits_only"]) !== "undefined" && $scope.query["exits_only"] == true) { + rs_query += "flag:exit" + " "; + } else if ((typeof $scope.query["guards_only"]) !== "undefined" && $scope.query["guards_only"] == true) { + rs_query += "flag:guard" + " "; + } - //Set the location bar for this search - $location.search($scope.query) + var by_country = ((typeof $scope.query["by_country"]) !== "undefined" && $scope.query["by_country"] == true); + var by_as = ((typeof $scope.query["by_as"]) !== "undefined" && $scope.query["by_as"] == true); + + var rs_url = "https://atlas.torproject.org/"; + + if (!by_country) { + if (!by_as) { + rs_url += "#search/running:true " + rs_query.trim(); + } else { + rs_url += "#aggregate/as/" + rs_query.trim(); + } + } else { + if (!by_as) { + rs_url += "#aggregate/cc/" + rs_query.trim(); + } else { + rs_url += "#aggregate/ascc/" + rs_query.trim(); + } + } - $http.get('result.json',{"params":$scope.query}) - .success(function(data) { - if (data.results.length > 0) { - $scope.data = data - $scope.state = "loaded" - if (success_cb != null){ - success_cb() - } - $('body').animate({scrollTop:$("div#result_table").offset().top},500) - } - else { - $scope.state = "result_empty" - } - }) + document.location = rs_url; }; $scope.reset = function() { diff --git a/templates/index.html b/templates/index.html index 54d6137..8962dd6 100644 --- a/templates/index.html +++ b/templates/index.html @@ -68,28 +68,24 @@ <div class="container" ng-controller="CompassCtrl"> <div class="hero-unit"> <div class="alert alert-danger"> - <p>The Tor Metrics team plans to shut down the Compass service at the - end of December 2017. Aggregated search functionality has been + <p>The Compass service has now been partially shut down. + Aggregated search functionality has been integrated into <a href="https://atlas.torproject.org/#aggregate">Relay Search</a> (formerly known as Atlas) to give a unified tool for - exploring both single relays and aggregations of relays.<p> + exploring both single relays and aggregations of relays. Any queries + made will redirect to Relay Search to display results.<p> <p>Please ensure that all the functionality you require is available in Relay Search before Compass is shut down. If any functionality is missing, please <a href="https://trac.torproject.org/projects/tor/newticket?component=Metrics/Atlas&…">file a ticket to request that it be added</a>.</p> + <p>This search form will no longer be available from 15th January 2018.</p> </div> <form class="form-horizontal" id="form"> <fieldset> <legend>Compass</legend> <div class="control-group"> <h3> Filter </h3> - <label class="control-label" for="inactive">Inactive</label> - <div class="controls"> - <label class="checkbox"> - <input type="checkbox" id="inactive" value="True" name="inactive" ng-model='query.inactive'> - include relays in selection that aren't currently running </label> - </div> <label class="control-label" for="guards">Guards</label> <div class="controls"> <label class="checkbox"> @@ -118,36 +114,13 @@ <label class="control-label" for="cc">Country</label> <div class="controls"> <select id="country" name="country" ng-model='query.country' - ui-select2 multiple data-placeholder="Germany"> + ui-select2 data-placeholder="Germany"> + <option value="">Any</option> <option ng-repeat="country in cc_data" value="{{country.id}}" >{{country.text}}</option> </select> - <span class="help-inline">select only relays from these countries</span> + <span class="help-inline">select only relays from this country</span> </div> </div> - <label class="control-label" for="exits">Exits</label> - <div class="controls"> - <label class="radio"> - <input type="radio" class="exits" name="exits" id="all_relays" value="all_relays" - ng-model='query.exit_filter' checked> - All relay - </label> - <label class="radio"> - <input type="radio" class="exits" name="exits" id="fast_exits_only" value="fast_exits_only" - ng-model='query.exit_filter'> - Fast exit relays (95+ Mbit/s, 5000+ KB/s, - 80/443/554/1755, 2 relays per /24) - </label> - <label class="radio"> - <input type="radio" class="exits" name="exits" id="almost_fast_exits_only" - value="almost_fast_exits_only" ng-model="almost_fast_exits_only"> - Almost fast exit relays (80+ Mbit/s, 2000+ KB/s, 80/443, not in set of fast exits) - </label> - <label class="radio"> - <input type="radio" class="exits" name="exits" id="fast_exits_only_any_network" - ng-model="query.exit_filter" value="fast_exits_only_any_network"> - Fast exits relays any network (95+ Mbit/s, 5000+ KB/s, 80/443/554/1755) - </label> - </div> <div class="control-group"> <h3> Group </h3> <label class="control-label" for="country">Country</label> @@ -158,8 +131,8 @@ </div> <label class="control-label" for="as">AS</label> <div class="controls"> - <input type="checkbox" id="by_as" value="True" name="by_as" ng-model="query.by_as"> - group relays by AS </label> + <label class="checkbox"> + <input type="checkbox" id="by_as" value="True" name="by_as" ng-model="query.by_as"> group relays by AS</label> </div> </div> @@ -168,8 +141,8 @@ <label class="control-label" for="top">Number of results</label> <div class="controls"> <input type="text" class="input-xlarge" id="top" name="top" - placeholder="10" value="10" ng-model="query.top"> - <span class="help-inline">display only the top results (-1 for all)</span> + placeholder="-1" value="-1" ng-model="query.top" disabled="disabled"> + <span class="help-inline">limiting of results is disabled</span> </div> </div> <div class="form-actions"> @@ -180,111 +153,6 @@ </form> </div> - <div class="hero-unit" ng-show="state == 'loading'" > - <div class='loading'><img src="static/img/loader.gif" /></div> - </div> - <div class="hero-unit" ng-show="state == 'result_empty'"> - <p>No results found</p> - </div> - <div id='result_table' class="hero-unit" ng-show="state == 'loaded' || state == 'sorting'"> - <table class="table table-striped"> - <thead> - <tr> - <th >#</th> - <th sortable='ajax_sort' ui-jq='tooltip' sort_by='cw' invert='true' - class='spinner-small' - icon="static/img/ajax-loader.gif" - title="Relative bandwidth weight assigned to this relay by the directory authorities"> - Consensus Weights - </th> - <th sortable='ajax_sort' ui-jq='tooltip' sort_by='adv_bw' invert='true' - class='spinner-small' - icon="static/img/ajax-loader.gif" - title="Relative advertised bandwidth of this relay compared to the total advertised bandwidth in the network">Advertised Bandwidth</th> - <th sortable='ajax_sort' ui-jq='tooltip' sort_by='p_guard' invert=true - icon="static/img/ajax-loader.gif" class='spinner-small' - title=" Probability of this relay to be selected for the guard position">Guard Probability</th> - <th sortable='ajax_sort' ui-jq='tooltip' sort_by='p_middle' invert=true - icon="static/img/ajax-loader.gif" class='spinner-small' - title="Probability of this relay to be selected for the middle position"> Middle Probability</th > - <th sortable='ajax_sort' ui-jq='tooltip' sort_by='p_exit' invert=true - icon="static/img/ajax-loader.gif" class='spinner-small' - title="Probability of this relay to be selected for the exit position" > Exit Probability</th > - <th sortable='ajax_sort' sort_by='nick' invert=false - icon="static/img/ajax-loader.gif" class='spinner-small' - >Nickname</th> - <th sortable='ajax_sort' sort_by='fp' invert=false - icon="static/img/ajax-loader.gif" class='spinner-small' - >Fingerprint</th> - <th sortable='ajax_sort' sort_by='exit' invert=false - icon="static/img/ajax-loader.gif" class='spinner-small' - >Exit</th> - <th sortable='ajax_sort' sort_by='guard' invert=false - icon="static/img/ajax-loader.gif" class='spinner-small' - >Guard</th> - <th sortable='ajax_sort' sort_by='cc' invert=false - icon="static/img/ajax-loader.gif" class='spinner-small' - >Country</th> - <th sortable='ajax_sort' sort_by='as_info' invert=false - icon="static/img/ajax-loader.gif" class='spinner-small' - >Autonomous System</th> - </tr> - </thead> - <tfoot> - <tr ng-show="data.excluded"> - <td> {{ data.excluded.index }} </td> - <td> {{ data.excluded.cw | number:4 }}%</td> - <td> {{ data.excluded.adv_bw | number:4}}%</td> - <td>{{ data.excluded.p_guard | number:4 }}%</td> - <td>{{ data.excluded.p_middle | number:4 }}%</td> - <td>{{ data.excluded.p_exit | number:4 }}%</td> - <td id="extra_table_title">{{ data.excluded.nick }}</td> - <td> {{data.excluded.fp }} </td> - <td>{{ data.excluded.exit }}</td> - <td>{{ data.excluded.guard }}</td> - <td>{{ data.excluded.cc }}</td> - <td>{{ data.excluded.as_info }}</td> - </tr> - <tr ng-show="data.total"> - <td> {{ data.total.index }} </td> - <td> {{ data.total.cw | number:4 }}%</td> - <td> {{ data.total.adv_bw | number:4}}%</td> - <td>{{ data.total.p_guard | number:4 }}%</td> - <td>{{ data.total.p_middle | number:4 }}%</td> - <td>{{ data.total.p_exit | number:4 }}%</td> - <td id='extra_table_title'>{{ data.total.nick }}</td> - <td> {{data.total.fp }} </td> - <td>{{ data.total.exit }}</td> - <td>{{ data.total.guard }}</td> - <td>{{ data.total.cc }}</td> - <td>{{ data.total.as_info }}</td> - </tr> - </tfoot> - <tbody> - <tr ng-repeat="relay in data.results "> - <td> {{ relay.index }} </td> - <td> {{ relay.cw | number:4 }}%</td> - <td> {{ relay.adv_bw | number:4}}%</td> - <td>{{ relay.p_guard | number:4 }}%</td> - <td>{{ relay.p_middle | number:4 }}%</td> - <td>{{ relay.p_exit | number:4 }}%</td> - <td>{{ relay.nick }}</td> - <td> - <span ng-show="relay.link"> - <a href="https://atlas.torproject.org/#details/{{relay.fp}}" >{{relay.fp | truncate:8:30}}</a> - </span> - <span ng-show="!relay.link">{{relay.fp | truncate:8:30}}</span> - </td> - <td>{{ relay.exit }}</td> - <td>{{ relay.guard }}</td> - <td>{{ relay.cc }}</td> - <td>{{ relay.as_info }}</td> - <tr> - </tbody> - </table> - </div> - </div> - </div>  <!-- Le javascript @@ -300,5 +168,22 @@ <script src="static/js/directives.js"></script> <script src="static/js/filters.js"></script> <script src="static/js/angularize.js"></script> + <script type="text/javascript"> + /* Onionoo does not yet support multiple flags */ + $('#guards_only').on('change', function(){ + if ($(this).is(':checked')) { + $('#exits_only').attr('disabled', 'disabled'); + } else { + $('#exits_only').removeAttr('disabled', 'disabled'); + } + }); + $('#exits_only').on('change', function(){ + if ($(this).is(':checked')) { + $('#guards_only').attr('disabled', 'disabled'); + } else { + $('#guards_only').removeAttr('disabled', 'disabled'); + } + }); + </script> </body> </html>

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 02 Jan '18

02 Jan '18

commit ecda4fefe52a05c106a53c9ea4d38d80adb87fa4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 2 15:15:54 2018 +0000 Update translations for liveusb-creator --- th/th.po | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/th/th.po b/th/th.po index d4c76cb59..19b52ee41 100644 --- a/th/th.po +++ b/th/th.po @@ -4,7 +4,7 @@ # # Translators: # bact' <arthit(a)gmail.com>, 2013 -# bact' <arthit(a)gmail.com>, 2017 +# bact' <arthit(a)gmail.com>, 2017-2018 # jiew <chiranuch(a)gmail.com>, 2013 # Manatsawin Hanmongkolchai <manatsawin(a)gmail.com>, 2009 # Somchai Sirisakdipol <mishari(a)mishari.net>, 2013 @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-10 15:57+0100\n" -"PO-Revision-Date: 2017-12-27 05:02+0000\n" +"PO-Revision-Date: 2018-01-02 15:12+0000\n" "Last-Translator: bact' <arthit(a)gmail.com>\n" "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n" "MIME-Version: 1.0\n" @@ -40,7 +40,7 @@ msgstr "เขียนไปยังอุปกรณ์ ณ %(speed)d MB/sec #: ../tails_installer/creator.py:184 msgid "Setting up OLPC boot file..." -msgstr "กำลังติดตั้งไฟล์บูท OLPC" +msgstr "กำลังตั้งค่าแฟ้มบูต OLPC..." #: ../tails_installer/creator.py:315 #, python-format @@ -127,7 +127,7 @@ msgstr "ไม่ทราบระบบแฟ้ม อุปกรณ์ข #: ../tails_installer/creator.py:765 ../tails_installer/creator.py:977 #, python-format msgid "Unsupported filesystem: %s" -msgstr "ระบบไฟล์ไม่สนับสนุน: %s" +msgstr "ระบบแฟ้มที่ไม่รองรับ: %s" #: ../tails_installer/creator.py:782 #, python-format @@ -179,7 +179,7 @@ msgstr "ลองทำต่อไปไม่ว่าอย่างไรก #: ../tails_installer/creator.py:971 ../tails_installer/creator.py:1364 msgid "Verifying filesystem..." -msgstr "กำลังตรวจสอบระบบไฟล์..." +msgstr "กำลังตรวจสอบระบบแฟ้ม..." #: ../tails_installer/creator.py:995 #, python-format @@ -216,17 +216,17 @@ msgstr "ฟอร์แมต %(device)s เป็น FAT32" #: ../tails_installer/creator.py:1249 msgid "Could not find syslinux' gptmbr.bin" -msgstr "" +msgstr "ไม่พบ gptmbr.bin ของ syslinux" #: ../tails_installer/creator.py:1262 #, python-format msgid "Reading extracted MBR from %s" -msgstr "" +msgstr "กำลังอ่าน MBR ที่ถูกสกัดจาก %s" #: ../tails_installer/creator.py:1266 #, python-format msgid "Could not read the extracted MBR from %(path)s" -msgstr "" +msgstr "ไม่สามารถอ่าน MBR ที่ถูกสกัดจาก %(path)s" #: ../tails_installer/creator.py:1279 ../tails_installer/creator.py:1280 #, python-format @@ -257,14 +257,14 @@ msgstr "ไม่พบอุปกรณ์ที่รองรับ" #: ../tails_installer/creator.py:1368 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" -msgstr "โปรดตรวจสอบให้แน่ใจว่าได้เสียบ USB key แล้วและถูกฟอร์แมตด้วยระบบไฟล์ FAT" +msgstr "โปรดตรวจสอบให้แน่ใจว่า USB key เสียบอยู่และมันถูกฟอร์แมตด้วยระบบแฟ้มแบบ FAT" #: ../tails_installer/creator.py:1371 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." -msgstr "ระบบไฟล์ไม่สนับสนุน: %s\nโปรดสำรองข้อมูลและฟอร์แมต USB key ด้วยระบบไฟล์แบบ FAT" +msgstr "ระบบแฟ้มที่ไม่รองรับ: %s\nโปรดสำรองข้อมูลและฟอร์แมต USB key ด้วยระบบไฟล์แบบ FAT" #: ../tails_installer/creator.py:1438 msgid "" @@ -304,7 +304,7 @@ msgstr "การติดตั้งเสร็จสิ้น! (%s)" #: ../tails_installer/gui.py:263 msgid "Tails installation failed!" -msgstr "" +msgstr "การติดตั้ง Tails ล้มเหลว!" #: ../tails_installer/gui.py:363 msgid "" @@ -315,32 +315,32 @@ msgstr "คำเตือน: เครื่องมือนี้จำเ #: ../tails_installer/gui.py:375 msgid "Tails Installer" -msgstr "" +msgstr "ตัวติดตั้ง Tails" #: ../tails_installer/gui.py:456 msgid "Upgrade" -msgstr "" +msgstr "ปรับรุ่น" #: ../tails_installer/gui.py:462 ../data/tails-installer.ui.h:7 msgid "Install" -msgstr "" +msgstr "ติดตั้ง" #: ../tails_installer/gui.py:469 #, python-format msgid "%(size)s %(vendor)s %(model)s device (%(device)s)" -msgstr "" +msgstr "%(size)s %(vendor)s %(model)s อุปกรณ์ (%(device)s)" #: ../tails_installer/gui.py:481 msgid "No ISO image selected" -msgstr "" +msgstr "ไม่ได้เลือกอิมเมจ ISO" #: ../tails_installer/gui.py:482 msgid "Please select a Tails ISO image." -msgstr "" +msgstr "กรุณาเลือกอิมเมจ ISO ของ Tails" #: ../tails_installer/gui.py:521 msgid "No device suitable to install Tails could be found" -msgstr "" +msgstr "ไม่พบอุปกรณ์ที่เหมาะสมสำหรับติดตั้ง Tails" #: ../tails_installer/gui.py:523 #, python-format @@ -380,7 +380,7 @@ msgstr "การติดตั้งเสร็จสิ้น!" #: ../tails_installer/gui.py:649 msgid "Installation was completed." -msgstr "" +msgstr "การติดตั้งเสร็จสมบูรณ์" #: ../tails_installer/gui.py:698 msgid "Unable to mount device" @@ -388,7 +388,7 @@ msgstr "ไม่สามารถเมานต์อุปกรณ์" #: ../tails_installer/gui.py:705 ../tails_installer/gui.py:735 msgid "Confirm the target USB stick" -msgstr "" +msgstr "ยืนยัน USB key เป้าหมาย" #: ../tails_installer/gui.py:706 #, python-format @@ -464,17 +464,17 @@ msgstr "" #: ../tails_installer/source.py:63 #, python-format msgid "'%s' does not exist" -msgstr "" +msgstr "ไม่มี '%s'" #: ../tails_installer/source.py:65 #, python-format msgid "'%s' is not a directory" -msgstr "" +msgstr "'%s' ไม่ใช่ไดเรกทอรี" #: ../tails_installer/source.py:75 #, python-format msgid "Skipping '%(filename)s'" -msgstr "" +msgstr "กำลังข้าม '%(filename)s'" #: ../tails_installer/utils.py:44 #, python-format @@ -489,7 +489,7 @@ msgstr "" #: ../data/tails-installer.ui.h:1 msgid "Installation Instructions" -msgstr "" +msgstr "ขั้นตอนการติดตั้ง" #: ../data/tails-installer.ui.h:2 msgid "Clone the current Tails" @@ -497,16 +497,16 @@ msgstr "" #: ../data/tails-installer.ui.h:3 msgid "Use a downloaded Tails ISO image" -msgstr "" +msgstr "ใช้อิมเมจ ISO ของ Tails ที่ดาวน์โหลดมา" #: ../data/tails-installer.ui.h:4 msgid "Select a distribution to download:" -msgstr "" +msgstr "เลือกดิสโทรที่ต้องการดาวน์โหลด" #: ../data/tails-installer.ui.h:5 msgid "Target USB stick:" -msgstr "" +msgstr "USB key เป้าหมาย:" #: ../data/tails-installer.ui.h:6 msgid "Reinstall (delete all data)" -msgstr "" +msgstr "ติดตั้งใหม่ (ลบข้อมูลทั้งหมด)"

1 0

[tor/release-0.2.9] Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 6e5e4f92ab8f63dfaed00a3dfeab7222c3e153a3 Merge: 79a50afa0 09b9a35c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 10:09:44 2018 -0500 Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9 changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit fb5877b9721dcc0d140c2c7c8d16d0b656bbf5d7 Merge: 08469a338 8a7767603 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 707076002d4db2b8b2e6f05bea86316674bf9f45 Merge: 94c59851d fb5877b97 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

1 0

[tor/master] Clear the address when we can't choose a reachable address
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 09b9a35c07a35c0891f8cb10406c113155740d18 Author: teor <teor2345(a)gmail.com> Date: Mon Dec 25 01:53:14 2017 +1100 Clear the address when we can't choose a reachable address When the fascist_firewall_choose_address_ functions don't find a reachable address, set the returned address to the null address and port. This is a precautionary measure, because some callers do not check the return value. Fixes bug 24736; bugfix on 0.2.8.2-alpha. --- changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/changes/bug24736 b/changes/bug24736 new file mode 100644 index 000000000..632560932 --- /dev/null +++ b/changes/bug24736 @@ -0,0 +1,6 @@ + o Minor bugfixes (address selection): + - When the fascist_firewall_choose_address_ functions don't find a + reachable address, set the returned address to the null address and port. + This is a precautionary measure, because some callers do not check the + return value. + Fixes bug 24736; bugfix on 0.2.8.2-alpha. diff --git a/src/or/policies.c b/src/or/policies.c index 50fec3a77..f09a70899 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -860,6 +860,8 @@ fascist_firewall_choose_address_base(const tor_addr_t *ipv4_addr, ap->port = result->port; return 1; } else { + tor_addr_make_null(&ap->addr, AF_UNSPEC); + ap->port = 0; return 0; } }

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit bc5ef83f8f960e9ccf0e8634301037e61d43f332 Merge: d53f77985 707076002 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.3.2' changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit 8a7767603a9ac826f39505fc9ea8c08385f6dfd6 Merge: 03b4dd92a 6e5e4f92a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 02 Jan '18

02 Jan '18

commit b2871cef91fbabd1dccdd8a424d5921948ab9d22 Merge: cbe36a739 6e5e4f92a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jan 2 10:10:28 2018 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug24736 | 6 ++++++ src/or/policies.c | 2 ++ 2 files changed, 8 insertions(+)

1 0