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

[tor/master] Do not truncate too long hostnames
by nickm＠torproject.org 25 Jan '17

25 Jan '17

commit d5a95e1ea1993027e2aad834586f7ab51b741800 Author: junglefowl <junglefowl(a)riseup.net> Date: Tue Jan 24 18:40:01 2017 +0000 Do not truncate too long hostnames If a hostname is supplied to tor-resolve which is too long, it will be silently truncated, resulting in a different hostname lookup: $ tor-resolve $(python -c 'print("google.com" + "m" * 256)') If tor-resolve uses SOCKS5, the length is stored in an unsigned char, which overflows in this case and leads to the hostname "google.com". As this one is a valid hostname, it returns an address instead of giving an error due to the invalid supplied hostname. --- src/tools/tor-resolve.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 29f85c4..6ac866d 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -80,6 +80,10 @@ build_socks_resolve_request(char **out, } ipv6 = reverse && tor_addr_family(&addr) == AF_INET6; addrlen = reverse ? (ipv6 ? 16 : 4) : 1 + strlen(hostname); + if (addrlen > UINT8_MAX) { + log_err(LD_GENERAL, "Hostname is too long!"); + return -1; + } len = 6 + addrlen; *out = tor_malloc(len); (*out)[0] = 5; /* SOCKS version 5 */

1 0

[tor/master] Add the output file to the usage
by nickm＠torproject.org 25 Jan '17

25 Jan '17

commit 1e26d6dbe8c5dac291a06060fa4bcac77c0c44e6 Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Tue Jan 24 15:56:26 2017 +0700 Add the output file to the usage --- scripts/maint/updateFallbackDirs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index ce837b4..117ac5c 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -1,7 +1,8 @@ #!/usr/bin/python -# Usage: scripts/maint/updateFallbackDirs.py > src/or/fallback_dirs.inc -# scripts/maint/updateFallbackDirs.py check_existing +# Usage: +# scripts/maint/updateFallbackDirs.py > src/or/fallback_dirs.inc +# scripts/maint/updateFallbackDirs.py check_existing > src/or/fallback_dirs.inc # # This script should be run from a stable, reliable network connection, # with no other network activity (and not over tor).

1 0

[tor/master] Automate checking existing fallbacks
by nickm＠torproject.org 25 Jan '17

25 Jan '17

commit 3fd58aa98dbae47ecb4a171f71278a78cf1e488e Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Fri Jan 20 15:37:32 2017 +0700 Automate checking existing fallbacks --- scripts/maint/updateFallbackDirs.py | 62 +++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 13 deletions(-) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index e0bc939..42ae0fa 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -37,17 +37,13 @@ import dateutil.parser # bson_lazy provides bson #from bson import json_util import copy +import re from stem.descriptor import DocumentHandler from stem.descriptor.remote import get_consensus import logging -# INFO tells you why each relay was included or excluded -# WARN tells you about potential misconfigurations and relay detail changes -logging.basicConfig(level=logging.WARNING) logging.root.name = '' -# INFO tells you about each consensus download attempt -logging.getLogger('stem').setLevel(logging.WARNING) HAVE_IPADDRESS = False try: @@ -148,6 +144,7 @@ BLACKLIST_EXCLUDES_WHITELIST_ENTRIES = True WHITELIST_FILE_NAME = 'scripts/maint/fallback.whitelist' BLACKLIST_FILE_NAME = 'scripts/maint/fallback.blacklist' +FALLBACK_FILE_NAME = 'src/or/fallback_dirs.inc' # The number of bytes we'll read from a filter file before giving up MAX_LIST_FILE_SIZE = 1024 * 1024 @@ -368,6 +365,15 @@ def read_from_file(file_name, max_len): ) return None +def parse_fallback_file(file_name): + file_data = read_from_file(file_name, MAX_LIST_FILE_SIZE) + file_data = cleanse_unprintable(file_data) + file_data = remove_bad_chars(file_data, '\n"\0') + file_data = re.sub('/\*.*?\*/', '', file_data) + file_data = file_data.replace(',', '\n') + file_data = file_data.replace(' weight=10', '') + return file_data + def load_possibly_compressed_response_json(response): if response.info().get('Content-Encoding') == 'gzip': buf = StringIO.StringIO( response.read() ) @@ -1431,7 +1437,7 @@ class CandidateList(dict): self.fallbacks.sort(key=lambda f: f._data[data_field]) @staticmethod - def load_relaylist(file_name): + def load_relaylist(file_obj): """ Read each line in the file, and parse it like a FallbackDir line: an IPv4 address and optional port: <IPv4 address>:<port> @@ -1446,8 +1452,9 @@ class CandidateList(dict): (of string -> string key/value pairs), and these dictionaries are placed in an array. comments start with # and are ignored """ + file_data = file_obj['data'] + file_name = file_obj['name'] relaylist = [] - file_data = read_from_file(file_name, MAX_LIST_FILE_SIZE) if file_data is None: return relaylist for line in file_data.split('\n'): @@ -1488,12 +1495,12 @@ class CandidateList(dict): return relaylist # apply the fallback whitelist and blacklist - def apply_filter_lists(self): + def apply_filter_lists(self, whitelist_obj, blacklist_obj): excluded_count = 0 logging.debug('Applying whitelist and blacklist.') # parse the whitelist and blacklist - whitelist = self.load_relaylist(WHITELIST_FILE_NAME) - blacklist = self.load_relaylist(BLACKLIST_FILE_NAME) + whitelist = self.load_relaylist(whitelist_obj) + blacklist = self.load_relaylist(blacklist_obj) filtered_fallbacks = [] for f in self.fallbacks: in_whitelist = f.is_in_whitelist(whitelist) @@ -2064,9 +2071,38 @@ class CandidateList(dict): s += 'or setting INCLUDE_UNLISTED_ENTRIES = True.' return s +def process_existing(): + logging.basicConfig(level=logging.INFO) + logging.getLogger('stem').setLevel(logging.INFO) + whitelist = {'data': parse_fallback_file(FALLBACK_FILE_NAME), + 'name': FALLBACK_FILE_NAME} + blacklist = {'data': read_from_file(BLACKLIST_FILE_NAME, MAX_LIST_FILE_SIZE), + 'name': BLACKLIST_FILE_NAME} + list_fallbacks(whitelist, blacklist) + +def process_default(): + logging.basicConfig(level=logging.WARNING) + logging.getLogger('stem').setLevel(logging.WARNING) + whitelist = {'data': read_from_file(WHITELIST_FILE_NAME, MAX_LIST_FILE_SIZE), + 'name': WHITELIST_FILE_NAME} + blacklist = {'data': read_from_file(BLACKLIST_FILE_NAME, MAX_LIST_FILE_SIZE), + 'name': BLACKLIST_FILE_NAME} + list_fallbacks(whitelist, blacklist) + ## Main Function +def main(): + if get_command() == 'check_existing': + process_existing() + else: + process_default() + +def get_command(): + if len(sys.argv) == 2: + return sys.argv[1] + else: + return None -def list_fallbacks(): +def list_fallbacks(whitelist, blacklist): """ Fetches required onionoo documents and evaluates the fallback directory criteria for each of the relays """ @@ -2099,7 +2135,7 @@ def list_fallbacks(): # warning that the details have changed from those in the whitelist. # instead, there will be an info-level log during the eligibility check. initial_count = len(candidates.fallbacks) - excluded_count = candidates.apply_filter_lists() + excluded_count = candidates.apply_filter_lists(whitelist, blacklist) print candidates.summarise_filters(initial_count, excluded_count) eligible_count = len(candidates.fallbacks) @@ -2170,4 +2206,4 @@ def list_fallbacks(): print x.fallbackdir_line(candidates.fallbacks, prefilter_fallbacks) if __name__ == "__main__": - list_fallbacks() + main()

1 0

[tor/master] Logging existing fallbacks at warning level
by nickm＠torproject.org 25 Jan '17

25 Jan '17

commit d97792d596f440eefe29db1b7287c0e3b3c4277a Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Fri Jan 20 15:38:30 2017 +0700 Logging existing fallbacks at warning level --- scripts/maint/updateFallbackDirs.py | 56 ++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index 42ae0fa..efa9bb4 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -708,15 +708,15 @@ class Candidate(object): # # if the relay doesn't have a recommended version field, exclude the relay if not self._data.has_key('recommended_version'): - logging.info('%s not a candidate: no recommended_version field', + log_excluded('%s not a candidate: no recommended_version field', self._fpr) return False if not self._data['recommended_version']: - logging.info('%s not a candidate: version not recommended', self._fpr) + log_excluded('%s not a candidate: version not recommended', self._fpr) return False # if the relay doesn't have version field, exclude the relay if not self._data.has_key('version'): - logging.info('%s not a candidate: no version field', self._fpr) + log_excluded('%s not a candidate: no version field', self._fpr) return False if self._data['version'] in Candidate.STALE_CONSENSUS_VERSIONS: logging.warning('%s not a candidate: version delivers stale consensuses', @@ -870,36 +870,36 @@ class Candidate(object): def is_candidate(self): try: if (MUST_BE_RUNNING_NOW and not self.is_running()): - logging.info('%s not a candidate: not running now, unable to check ' + + log_excluded('%s not a candidate: not running now, unable to check ' + 'DirPort consensus download', self._fpr) return False if (self._data['last_changed_address_or_port'] > self.CUTOFF_ADDRESS_AND_PORT_STABLE): - logging.info('%s not a candidate: changed address/port recently (%s)', + log_excluded('%s not a candidate: changed address/port recently (%s)', self._fpr, self._data['last_changed_address_or_port']) return False if self._running < CUTOFF_RUNNING: - logging.info('%s not a candidate: running avg too low (%lf)', + log_excluded('%s not a candidate: running avg too low (%lf)', self._fpr, self._running) return False if self._v2dir < CUTOFF_V2DIR: - logging.info('%s not a candidate: v2dir avg too low (%lf)', + log_excluded('%s not a candidate: v2dir avg too low (%lf)', self._fpr, self._v2dir) return False if self._badexit is not None and self._badexit > PERMITTED_BADEXIT: - logging.info('%s not a candidate: badexit avg too high (%lf)', + log_excluded('%s not a candidate: badexit avg too high (%lf)', self._fpr, self._badexit) return False # this function logs a message depending on which check fails if not self.is_valid_version(): return False if self._guard < CUTOFF_GUARD: - logging.info('%s not a candidate: guard avg too low (%lf)', + log_excluded('%s not a candidate: guard avg too low (%lf)', self._fpr, self._guard) return False if (not self._data.has_key('consensus_weight') or self._data['consensus_weight'] < 1): - logging.info('%s not a candidate: consensus weight invalid', self._fpr) + log_excluded('%s not a candidate: consensus weight invalid', self._fpr) return False except BaseException as e: logging.warning("Exception %s when checking if fallback is a candidate", @@ -980,26 +980,26 @@ class Candidate(object): for key in entry: value = entry[key] if key == 'id' and value == self._fpr: - logging.info('%s is in the blacklist: fingerprint matches', + log_excluded('%s is in the blacklist: fingerprint matches', self._fpr) return True if key == 'ipv4' and value == self.dirip: # if the dirport is present, check it too if entry.has_key('dirport'): if int(entry['dirport']) == self.dirport: - logging.info('%s is in the blacklist: IPv4 (%s) and ' + + log_excluded('%s is in the blacklist: IPv4 (%s) and ' + 'DirPort (%d) match', self._fpr, self.dirip, self.dirport) return True # if the orport is present, check it too elif entry.has_key('orport'): if int(entry['orport']) == self.orport: - logging.info('%s is in the blacklist: IPv4 (%s) and ' + + log_excluded('%s is in the blacklist: IPv4 (%s) and ' + 'ORPort (%d) match', self._fpr, self.dirip, self.orport) return True else: - logging.info('%s is in the blacklist: IPv4 (%s) matches, and ' + + log_excluded('%s is in the blacklist: IPv4 (%s) matches, and ' + 'entry has no DirPort or ORPort', self._fpr, self.dirip) return True @@ -1013,19 +1013,19 @@ class Candidate(object): # if the dirport is present, check it too if entry.has_key('dirport'): if int(entry['dirport']) == self.dirport: - logging.info('%s is in the blacklist: IPv6 (%s) and ' + + log_excluded('%s is in the blacklist: IPv6 (%s) and ' + 'DirPort (%d) match', self._fpr, ipv6, self.dirport) return True # we've already checked the ORPort, it's part of entry['ipv6'] else: - logging.info('%s is in the blacklist: IPv6 (%s) matches, and' + + log_excluded('%s is in the blacklist: IPv6 (%s) matches, and' + 'entry has no DirPort', self._fpr, ipv6) return True elif (key == 'ipv6' or self.has_ipv6()): # only log if the fingerprint matches but the IPv6 doesn't if entry.has_key('id') and entry['id'] == self._fpr: - logging.info('%s skipping IPv6 blacklist comparison: relay ' + + log_excluded('%s skipping IPv6 blacklist comparison: relay ' + 'has%s IPv6%s, but entry has%s IPv6%s', self._fpr, '' if self.has_ipv6() else ' no', (' (' + ipv6 + ')') if self.has_ipv6() else '', @@ -1193,7 +1193,7 @@ class Candidate(object): time_since_expiry = (end - consensus.valid_until).total_seconds() except Exception, stem_error: end = datetime.datetime.utcnow() - logging.info('Unable to retrieve a consensus from %s: %s', nickname, + log_excluded('Unable to retrieve a consensus from %s: %s', nickname, stem_error) status = 'error: "%s"' % (stem_error) level = logging.WARNING @@ -1520,7 +1520,7 @@ class CandidateList(dict): elif in_blacklist: # exclude excluded_count += 1 - logging.info('Excluding %s: in blacklist.', f._fpr) + log_excluded('Excluding %s: in blacklist.', f._fpr) else: if INCLUDE_UNLISTED_ENTRIES: # include @@ -1528,7 +1528,7 @@ class CandidateList(dict): else: # exclude excluded_count += 1 - logging.info('Excluding %s: in neither blacklist nor whitelist.', + log_excluded('Excluding %s: in neither blacklist nor whitelist.', f._fpr) self.fallbacks = filtered_fallbacks return excluded_count @@ -1564,7 +1564,7 @@ class CandidateList(dict): # the bandwidth we log here is limited by the relay's consensus weight # as well as its adverttised bandwidth. See set_measured_bandwidth # for details - logging.info('%s not a candidate: bandwidth %.1fMByte/s too low, ' + + log_excluded('%s not a candidate: bandwidth %.1fMByte/s too low, ' + 'must be at least %.1fMByte/s', f._fpr, f._data['measured_bandwidth']/(1024.0*1024.0), MIN_BANDWIDTH/(1024.0*1024.0)) @@ -1668,13 +1668,13 @@ class CandidateList(dict): CandidateList.attribute_add(f.ipv6addr, ip_list) elif not CandidateList.attribute_allow(f.dirip, ip_list, MAX_FALLBACKS_PER_IPV4): - logging.info('Eliminated %s: already have %d fallback(s) on IPv4 %s' + log_excluded('Eliminated %s: already have %d fallback(s) on IPv4 %s' %(f._fpr, CandidateList.attribute_count(f.dirip, ip_list), f.dirip)) elif (f.has_ipv6() and not CandidateList.attribute_allow(f.ipv6addr, ip_list, MAX_FALLBACKS_PER_IPV6)): - logging.info('Eliminated %s: already have %d fallback(s) on IPv6 %s' + log_excluded('Eliminated %s: already have %d fallback(s) on IPv6 %s' %(f._fpr, CandidateList.attribute_count(f.ipv6addr, ip_list), f.ipv6addr)) @@ -1698,7 +1698,7 @@ class CandidateList(dict): contact_limit_fallbacks.append(f) CandidateList.attribute_add(f._data['contact'], contact_list) else: - logging.info( + log_excluded( 'Eliminated %s: already have %d fallback(s) on ContactInfo %s' %(f._fpr, CandidateList.attribute_count(f._data['contact'], contact_list), @@ -1727,7 +1727,7 @@ class CandidateList(dict): else: # we already have a fallback with this fallback in its effective # family - logging.info( + log_excluded( 'Eliminated %s: already have %d fallback(s) in effective family' %(f._fpr, CandidateList.attribute_count(f._fpr, fingerprint_list))) original_count = len(self.fallbacks) @@ -2102,6 +2102,12 @@ def get_command(): else: return None +def log_excluded(msg, *args): + if get_command() == 'check_existing': + logging.warning(msg, *args) + else: + logging.info(msg, *args) + def list_fallbacks(whitelist, blacklist): """ Fetches required onionoo documents and evaluates the fallback directory criteria for each of the relays """

1 0

[tor/master] Add ChangeLog for check_existing
by nickm＠torproject.org 25 Jan '17

25 Jan '17

commit 05c1e2b7d6bc2369cbc01f2aff4e6823539c8690 Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Wed Jan 25 13:58:23 2017 +0700 Add ChangeLog for check_existing --- changes/ticket20174 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket20174 b/changes/ticket20174 new file mode 100644 index 0000000..b727fc1 --- /dev/null +++ b/changes/ticket20174 @@ -0,0 +1,4 @@ + o Minor feature (fallback scripts): + - Add a check_existing mode to updateFallbackDirs.py, which checks if + fallbacks in the hard-coded list are working. Closes ticket 20174. + Patch by haxxpop.

1 0

[tor/master] Add usage for check_existing
by nickm＠torproject.org 25 Jan '17

25 Jan '17

commit e6eaf14350a2e36855d035cd3eb48074a4785c46 Author: Suphanat Chunhapanya <haxx.pop(a)gmail.com> Date: Fri Jan 20 15:43:24 2017 +0700 Add usage for check_existing --- scripts/maint/updateFallbackDirs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py index efa9bb4..ce837b4 100755 --- a/scripts/maint/updateFallbackDirs.py +++ b/scripts/maint/updateFallbackDirs.py @@ -1,6 +1,7 @@ #!/usr/bin/python # Usage: scripts/maint/updateFallbackDirs.py > src/or/fallback_dirs.inc +# scripts/maint/updateFallbackDirs.py check_existing # # This script should be run from a stable, reliable network connection, # with no other network activity (and not over tor).

1 0

[webwml/staging] Fix layout for verify signature page
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit 749164d0dee90be98adada836f24b399978ccdd7 Author: hiromipaw <hiro(a)torproject.org> Date: Wed Jan 25 18:03:51 2017 +0100 Fix layout for verify signature page --- docs/en/verifying-signatures.wml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml index d7f02fb..1db3fd9 100644 --- a/docs/en/verifying-signatures.wml +++ b/docs/en/verifying-signatures.wml @@ -93,7 +93,9 @@ To verify the signature of the package you downloaded, you will need to download the ".asc" file as well. Assuming you downloaded the package and its signature to your Desktop, run: - <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --verify C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe.asc C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe</pre> + <pre>"C:\Program Files\Gnu\GnuPg\gpg.exe" --verify + C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe.asc + C:\Users\Alice\Desktop\torbrowser-install-<version-torbrowserbundle>_en-US.exe</pre> The output should say "Good signature": <pre> gpg: Signature made Tue 24 Jan 2015 09:29:09 AM CET using RSA key ID D40814E0 @@ -152,7 +154,8 @@ <pre>gpg --verify ~/Downloads/TorBrowser-<version-torbrowserbundleosx64>-osx64_en-US.dmg{.asc*,}</pre> For Linux users (change 32 to 64 if you have the 64-bit package): - <pre>gpg --verify tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz.asc tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz</pre> + <pre>gpg --verify tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz.asc + tor-browser-linux32-<version-torbrowserbundlelinux32>_en-US.tar.xz</pre> The output should say "Good signature":

1 0

[webwml/staging] Add new Tor Browser version: 6.5
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit 4dd17904ac3b8aa828b065b54b21fdeb6958ef5e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 24 23:11:31 2017 +0100 Add new Tor Browser version: 6.5 --- include/versions.wmi | 26 +++++++++++++------------- projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 7702348..35e599d 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,30 +1,30 @@ <define-tag version-stable whitespace=delete>0.2.9.9</define-tag> <define-tag version-alpha whitespace=delete>0.3.0.2-alpha</define-tag> -<define-tag version-win32-stable whitespace=delete>0.2.8.11</define-tag> +<define-tag version-win32-stable whitespace=delete>0.2.9.9</define-tag> -<define-tag version-torbrowserdevelopbranch whitespace=delete>maint-6.0</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>6.0.8</define-tag> +<define-tag version-torbrowserdevelopbranch whitespace=delete>maint-6.5</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>6.5</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>6.5a6</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>6.0.8</define-tag> -<define-tag releasedate-torbrowserbundle whitespace=delete>2016-12-13</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>6.5</define-tag> +<define-tag releasedate-torbrowserbundle whitespace=delete>2017-01-24</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>6.5a6</define-tag> <define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-12-14</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>6.0.8</define-tag> -<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2016-12-13</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>6.0.8</define-tag> -<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2016-12-13</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>6.5</define-tag> +<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2017-01-24</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>6.5</define-tag> +<define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2017-01-24</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.5a6</define-tag> <define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-12-14</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.5a6</define-tag> <define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-12-14</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>6.0.8</define-tag> -<define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2016-12-13</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>6.0.8</define-tag> -<define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2016-12-13</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>6.5</define-tag> +<define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2017-01-24</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>6.5</define-tag> +<define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2017-01-24</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>6.5a6</define-tag> <define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-12-14</define-tag> <define-tag version-torbrowsersandboxlinux whitespace=delete>0.0.2</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index 14943d4..4ae3e8c 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,6 +3,10 @@ "6.0.8-Linux", "6.0.8-MacOS", "6.0.8-Windows", +"6.5", +"6.5-Linux", +"6.5-MacOS", +"6.5-Windows", "6.5a6", "6.5a6-Linux", "6.5a6-MacOS",

1 0

[webwml/staging] Switch pt-PT to pt-BR in include/lang.wmi too
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit c9bb515d3d8e95c9ddb6a6ef3083574bd51d489e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 24 23:20:30 2017 +0100 Switch pt-PT to pt-BR in include/lang.wmi too --- include/lang.wmi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/lang.wmi b/include/lang.wmi index 2f5e794..366de0a 100644 --- a/include/lang.wmi +++ b/include/lang.wmi @@ -16,7 +16,7 @@ <option value="ko">Korean</option> <option value="nl">Nederlands</option> <option value="pl">Polish</option> - <option value="pt-PT">Português</option> + <option value="pt-BR">Português</option> <option value="ru">Русский</option> <option value="tr">Türkçe</option> <option value="vi">Vietnamese</option>

1 0

[webwml/staging] Switch pt-PT to pt-BR for Tor Browser stable release
by hiro＠torproject.org 25 Jan '17

25 Jan '17

commit 56b2b6495f1fb923e58c32d9f973f94290cd1fd9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Jan 24 23:07:01 2017 +0100 Switch pt-PT to pt-BR for Tor Browser stable release --- projects/en/torbrowser.wml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml index a628d28..65366da 100644 --- a/projects/en/torbrowser.wml +++ b/projects/en/torbrowser.wml @@ -234,17 +234,17 @@ (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_pl.tar.xz.asc">sig</a>)</td> </tr> <tr> - <td>Português (pt-PT)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_pt-PT.exe">32/64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_pt-PT.exe.asc">sig</a>)</td> - <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx64_pt-PT.dmg">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx64_pt-PT.dmg.asc">sig</a>) + <td>Português (pt-BR)</td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_pt-BR.exe">32/64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/torbrowser-install-<version-torbrowserbundle>_pt-BR.exe.asc">sig</a>)</td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx64_pt-BR.dmg">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/TorBrowser-<version-torbrowserbundleosx64>-osx64_pt-BR.dmg.asc">sig</a>)  - <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pt-PT.tar.xz">32-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pt-PT.tar.xz.asc">sig</a>) - • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_pt-PT.tar.xz">64-bit</a> - (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_pt-PT.tar.xz.asc">sig</a>)</td> + <td><a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pt-BR.tar.xz">32-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux32-<version-torbrowserbundlelinux32>_pt-BR.tar.xz.asc">sig</a>) + • <a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_pt-BR.tar.xz">64-bit</a> + (<a href="../dist/torbrowser/<version-torbrowserbundledir>/tor-browser-linux64-<version-torbrowserbundlelinux64>_pt-BR.tar.xz.asc">sig</a>)</td> </tr> <tr class="alt"> <td>Русский (ru)</td>

1 0