- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 40019: Ship our own runtime library for macOS
by sysrqb＠torproject.org 07 Aug '20

07 Aug '20

commit 97b5bc037774a88bb881a4e0c7d5ff5a18889348 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 4 07:22:38 2020 +0000 Bug 40019: Ship our own runtime library for macOS --- projects/firefox/build | 5 - projects/firefox/config | 6 - projects/macosx-toolchain/43909.patch | 252 +++++++++++++++++++++ projects/macosx-toolchain/build | 95 +++++++- .../compiler-rt-cross-compile.patch | 15 ++ .../macosx-toolchain/compiler-rt-no-codesign.patch | 21 ++ projects/macosx-toolchain/config | 29 ++- 7 files changed, 405 insertions(+), 18 deletions(-) diff --git a/projects/firefox/build b/projects/firefox/build index daedf7f..5ddd4de 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -14,11 +14,6 @@ mkdir -p [% dest_dir _ '/' _ c('filename') %] cp /var/tmp/dist/mingw-w64/gcclibs/{libssp.a,libssp_nonshared.a} /var/tmp/dist/mingw-w64-clang/[% c("arch") %]-w64-mingw32/lib/ [% END -%] -[% IF c("var/osx") %] - mkdir -p /var/tmp/dist/macosx-toolchain/clang/lib/clang/[% pc("clang", "version") %]/lib/darwin - mv libclang_rt.osx.a /var/tmp/dist/macosx-toolchain/clang/lib/clang/[% pc("clang", "version") %]/lib/darwin -[% END -%] - tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/cbindgen') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %] diff --git a/projects/firefox/config b/projects/firefox/config index 2ee16e4..9876240 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -182,9 +182,3 @@ input_files: # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin - filename: namecoin-etld.patch enable: '[% c("var/namecoin") %]' - # The library is extracted from Mozilla's officially used Clang, downloaded - # from https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/TYTqgyybSLmp0O…. - # Its SHA-256 sum is 7b0a6e60f102d3dbf618ae9e25d990d4dc72c76eb5accb5974ec70c11ff7e049. - - URL: https://people.torproject.org/~gk/mirrors/sources/libclang_rt.osx.a - sha256sum: 33541fb054e7dc372b5e9708bbcc175561d7fdbc9b00bf964e0c60b82bd8165a - enable: '[% c("var/osx") %]' diff --git a/projects/macosx-toolchain/43909.patch b/projects/macosx-toolchain/43909.patch new file mode 100644 index 0000000..78d2a75 --- /dev/null +++ b/projects/macosx-toolchain/43909.patch @@ -0,0 +1,252 @@ +From c95310f2d4fd3c88241c3b5d6dbf6251d34a3256 Mon Sep 17 00:00:00 2001 +From: Nikita Popov <nikita.ppv(a)gmail.com> +Date: Sat, 16 Nov 2019 16:22:18 +0100 +Subject: [PATCH] Restructure caching + +Variant on D70103. The caching is switched to always use a BB to +cache entry map, which then contains per-value caches. A separate +set contains value handles with a deletion callback. This allows us +to properly invalidate overdefined values. + +A possible alternative would be to always cache by value first and +have per-BB maps/sets in the each cache entry. In that case we could +use a ValueMap and would avoid the separate value handle set. I went +with the BB indexing at the top level to make it easier to integrate +D69914, but possibly that's not the right choice. + +Differential Revision: https://reviews.llvm.org/D70376 + +diff --git a/llvm/lib/Analysis/LazyValueInfo.cpp b/llvm/lib/Analysis/LazyValueInfo.cpp +index 110c085d3f3..aa6862cb588 100644 +--- a/llvm/lib/Analysis/LazyValueInfo.cpp ++++ b/llvm/lib/Analysis/LazyValueInfo.cpp +@@ -133,12 +133,9 @@ namespace { + /// A callback value handle updates the cache when values are erased. + class LazyValueInfoCache; + struct LVIValueHandle final : public CallbackVH { +- // Needs to access getValPtr(), which is protected. +- friend struct DenseMapInfo<LVIValueHandle>; +- + LazyValueInfoCache *Parent; + +- LVIValueHandle(Value *V, LazyValueInfoCache *P) ++ LVIValueHandle(Value *V, LazyValueInfoCache *P = nullptr) + : CallbackVH(V), Parent(P) { } + + void deleted() override; +@@ -152,89 +149,63 @@ namespace { + /// This is the cache kept by LazyValueInfo which + /// maintains information about queries across the clients' queries. + class LazyValueInfoCache { +- /// This is all of the cached block information for exactly one Value*. +- /// The entries are sorted by the BasicBlock* of the +- /// entries, allowing us to do a lookup with a binary search. +- /// Over-defined lattice values are recorded in OverDefinedCache to reduce +- /// memory overhead. +- struct ValueCacheEntryTy { +- ValueCacheEntryTy(Value *V, LazyValueInfoCache *P) : Handle(V, P) {} +- LVIValueHandle Handle; +- SmallDenseMap<PoisoningVH<BasicBlock>, ValueLatticeElement, 4> BlockVals; ++ /// This is all of the cached information for one basic block. It contains ++ /// the per-value lattice elements, as well as a separate set for ++ /// overdefined values to reduce memory usage. ++ struct BlockCacheEntryTy { ++ SmallDenseMap<AssertingVH<Value>, ValueLatticeElement, 4> LatticeElements; ++ SmallDenseSet<AssertingVH<Value>, 4> OverDefined; + }; + +- /// This tracks, on a per-block basis, the set of values that are +- /// over-defined at the end of that block. +- typedef DenseMap<PoisoningVH<BasicBlock>, SmallPtrSet<Value *, 4>> +- OverDefinedCacheTy; +- /// Keep track of all blocks that we have ever seen, so we +- /// don't spend time removing unused blocks from our caches. +- DenseSet<PoisoningVH<BasicBlock> > SeenBlocks; +- +- /// This is all of the cached information for all values, +- /// mapped from Value* to key information. +- DenseMap<Value *, std::unique_ptr<ValueCacheEntryTy>> ValueCache; +- OverDefinedCacheTy OverDefinedCache; +- ++ /// Cached information per basic block. ++ DenseMap<PoisoningVH<BasicBlock>, BlockCacheEntryTy> BlockCache; ++ /// Set of value handles used to erase values from the cache on deletion. ++ DenseSet<LVIValueHandle, DenseMapInfo<Value *>> ValueHandles; + + public: + void insertResult(Value *Val, BasicBlock *BB, + const ValueLatticeElement &Result) { +- SeenBlocks.insert(BB); +- ++ auto &CacheEntry = BlockCache.try_emplace(BB).first->second; + // Insert over-defined values into their own cache to reduce memory + // overhead. + if (Result.isOverdefined()) +- OverDefinedCache[BB].insert(Val); +- else { +- auto It = ValueCache.find_as(Val); +- if (It == ValueCache.end()) { +- ValueCache[Val] = make_unique<ValueCacheEntryTy>(Val, this); +- It = ValueCache.find_as(Val); +- assert(It != ValueCache.end() && "Val was just added to the map!"); +- } +- It->second->BlockVals[BB] = Result; +- } +- } +- +- bool isOverdefined(Value *V, BasicBlock *BB) const { +- auto ODI = OverDefinedCache.find(BB); +- +- if (ODI == OverDefinedCache.end()) +- return false; ++ CacheEntry.OverDefined.insert(Val); ++ else ++ CacheEntry.LatticeElements.insert({ Val, Result }); + +- return ODI->second.count(V); ++ auto HandleIt = ValueHandles.find_as(Val); ++ if (HandleIt == ValueHandles.end()) ++ ValueHandles.insert({ Val, this }); + } + + bool hasCachedValueInfo(Value *V, BasicBlock *BB) const { +- if (isOverdefined(V, BB)) +- return true; +- +- auto I = ValueCache.find_as(V); +- if (I == ValueCache.end()) ++ auto It = BlockCache.find(BB); ++ if (It == BlockCache.end()) + return false; + +- return I->second->BlockVals.count(BB); ++ return It->second.OverDefined.count(V) || ++ It->second.LatticeElements.count(V); + } + + ValueLatticeElement getCachedValueInfo(Value *V, BasicBlock *BB) const { +- if (isOverdefined(V, BB)) ++ auto It = BlockCache.find(BB); ++ if (It == BlockCache.end()) ++ return ValueLatticeElement(); ++ ++ if (It->second.OverDefined.count(V)) + return ValueLatticeElement::getOverdefined(); + +- auto I = ValueCache.find_as(V); +- if (I == ValueCache.end()) ++ auto LatticeIt = It->second.LatticeElements.find(V); ++ if (LatticeIt == It->second.LatticeElements.end()) + return ValueLatticeElement(); +- auto BBI = I->second->BlockVals.find(BB); +- if (BBI == I->second->BlockVals.end()) +- return ValueLatticeElement(); +- return BBI->second; ++ ++ return LatticeIt->second; + } + + /// clear - Empty the cache. + void clear() { +- SeenBlocks.clear(); +- ValueCache.clear(); +- OverDefinedCache.clear(); ++ BlockCache.clear(); ++ ValueHandles.clear(); + } + + /// Inform the cache that a given value has been deleted. +@@ -248,23 +219,18 @@ namespace { + /// OldSucc might have (unless also overdefined in NewSucc). This just + /// flushes elements from the cache and does not add any. + void threadEdgeImpl(BasicBlock *OldSucc,BasicBlock *NewSucc); +- +- friend struct LVIValueHandle; + }; + } + + void LazyValueInfoCache::eraseValue(Value *V) { +- for (auto I = OverDefinedCache.begin(), E = OverDefinedCache.end(); I != E;) { +- // Copy and increment the iterator immediately so we can erase behind +- // ourselves. +- auto Iter = I++; +- SmallPtrSetImpl<Value *> &ValueSet = Iter->second; +- ValueSet.erase(V); +- if (ValueSet.empty()) +- OverDefinedCache.erase(Iter); ++ for (auto &Pair : BlockCache) { ++ Pair.second.LatticeElements.erase(V); ++ Pair.second.OverDefined.erase(V); + } + +- ValueCache.erase(V); ++ auto HandleIt = ValueHandles.find_as(V); ++ if (HandleIt != ValueHandles.end()) ++ ValueHandles.erase(HandleIt); + } + + void LVIValueHandle::deleted() { +@@ -274,18 +240,7 @@ void LVIValueHandle::deleted() { + } + + void LazyValueInfoCache::eraseBlock(BasicBlock *BB) { +- // Shortcut if we have never seen this block. +- DenseSet<PoisoningVH<BasicBlock> >::iterator I = SeenBlocks.find(BB); +- if (I == SeenBlocks.end()) +- return; +- SeenBlocks.erase(I); +- +- auto ODI = OverDefinedCache.find(BB); +- if (ODI != OverDefinedCache.end()) +- OverDefinedCache.erase(ODI); +- +- for (auto &I : ValueCache) +- I.second->BlockVals.erase(BB); ++ BlockCache.erase(BB); + } + + void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, +@@ -303,10 +258,11 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + std::vector<BasicBlock*> worklist; + worklist.push_back(OldSucc); + +- auto I = OverDefinedCache.find(OldSucc); +- if (I == OverDefinedCache.end()) ++ auto I = BlockCache.find(OldSucc); ++ if (I == BlockCache.end() || I->second.OverDefined.empty()) + return; // Nothing to process here. +- SmallVector<Value *, 4> ValsToClear(I->second.begin(), I->second.end()); ++ SmallVector<Value *, 4> ValsToClear(I->second.OverDefined.begin(), ++ I->second.OverDefined.end()); + + // Use a worklist to perform a depth-first search of OldSucc's successors. + // NOTE: We do not need a visited list since any blocks we have already +@@ -320,10 +276,10 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + if (ToUpdate == NewSucc) continue; + + // If a value was marked overdefined in OldSucc, and is here too... +- auto OI = OverDefinedCache.find(ToUpdate); +- if (OI == OverDefinedCache.end()) ++ auto OI = BlockCache.find(ToUpdate); ++ if (OI == BlockCache.end() || OI->second.OverDefined.empty()) + continue; +- SmallPtrSetImpl<Value *> &ValueSet = OI->second; ++ auto &ValueSet = OI->second.OverDefined; + + bool changed = false; + for (Value *V : ValsToClear) { +@@ -333,11 +289,6 @@ void LazyValueInfoCache::threadEdgeImpl(BasicBlock *OldSucc, + // If we removed anything, then we potentially need to update + // blocks successors too. + changed = true; +- +- if (ValueSet.empty()) { +- OverDefinedCache.erase(OI); +- break; +- } + } + + if (!changed) continue; +-- +2.24.0 + diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index cd19c1d..0f67c38 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -1,17 +1,100 @@ #!/bin/bash [% c("var/set_default_env") -%] +builddir=/var/tmp/build +mkdir $builddir distdir="/var/tmp/dist/[% project %]" mkdir -p "$distdir" -tar xjf [% c('input_files_by_name/SDK') %] -mv MacOSX10.11.sdk "$distdir/" -tar xf [% c('input_files_by_name/clang') %] -mv clang "$distdir/clang" +tar -C /var/tmp/dist -xf [% c('input_files_by_name/cmake') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/ninja') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang_compiler') %] +tar -C $builddir -xf [% c('input_files_by_name/llvm') %] +tar -C $builddir -xf [% c('input_files_by_name/clang') %] +tar -C $builddir -xf [% c('input_files_by_name/libcxx') %] +tar -C $builddir -xf [% c('input_files_by_name/libcxxabi') %] +tar -C $builddir -xf [% c('input_files_by_name/lld') %] +tar -C $builddir -xf [% c('input_files_by_name/compiler-rt') %] +tar -C $distdir -xf [% c('input_files_by_name/SDK') %] tar -C $distdir -xf [% c('input_files_by_name/cctools') %] -cd $distdir/cctools/bin + +clangdir=/var/tmp/dist/clang/bin +cctoolsdir=$distdir/cctools/bin +sysrootdir=$distdir/MacOSX10.11.sdk/ +# We still need to put the cctoolsdir on the path. That's because of `lipo`. See +# the respective comment in the cctools build script. +export PATH="/var/tmp/dist/ninja:/var/tmp/dist/cmake/bin:$cctoolsdir:$PATH" +export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] + +cd $builddir +mv llvm-* llvm +# LLVM has reproducibility issues when optimizing bitcode, which we need to +# patch. See: #32053 for more details. +patch -p1 < $rootdir/43909.patch +mv clang-* llvm/tools/clang +mv libcxx-* llvm/projects/libcxx +mv libcxxabi-* llvm/projects/libcxxabi +mv lld-* llvm/tools/lld +mv compiler-rt-* compiler-rt +patch -p1 < $rootdir/compiler-rt-cross-compile.patch +patch -p1 < $rootdir/compiler-rt-no-codesign.patch +mv compiler-rt llvm/projects +mkdir build +cd build +# We follow quite closely Mozilla's build/build-clang/build-clang.py with the +# clang-macosx64.json flavor. This currently implies disabling Xray as it +# requires an OSX 10.12 SDK (see: https://bugs.llvm.org/show_bug.cgi?id=38959) +cmake -GNinja \ + -DCMAKE_C_COMPILER=$clangdir/clang \ + -DCMAKE_CXX_COMPILER=$clangdir/clang++ \ + -DCMAKE_ASM_COMPILER=$clangdir/clang \ + -DCMAKE_LINKER=$clangdir/clang \ + -DCMAKE_AR=$cctoolsdir/x86_64-apple-darwin-ar \ + -DCMAKE_C_FLAGS="[% c('var/FLAGS') %] -I$sysrootdir/usr/include -iframework $sysrootdir/System/Library/Frameworks" \ + -DCMAKE_CXX_FLAGS="-stdlib=libc++ [% c('var/FLAGS') %] -I$sysrootdir/usr/include -iframework $sysrootdir/System/Library/Frameworks" \ + -DCMAKE_ASM_FLAGS="[% c('var/FLAGS') %] -I$sysrootdir/usr/include -iframework $sysrootdir/System/Library/Frameworks" \ + -DCMAKE_EXE_LINKER_FLAGS="[% c('var/LDFLAGS') %]" \ + -DCMAKE_SHARED_LINKER_FLAGS="[% c('var/LDFLAGS') %]" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$distdir/clang \ + -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \ + -DLLVM_ENABLE_ASSERTIONS=OFF \ + -DPYTHON_EXECUTABLE=/usr/bin/python2.7 \ + -DLLVM_TOOL_LIBCXX_BUILD=ON \ + -DLLVM_ENABLE_BINDINGS=OFF \ + -DLLVM_ENABLE_LIBXML2=FORCE_ON \ + -DLLVM_LINK_LLVM_DYLIB=ON \ + -DCMAKE_RANLIB=$cctoolsdir/x86_64-apple-darwin-ranlib \ + -DCMAKE_LIBTOOL=$cctoolsdir/x86_64-apple-darwin-libtool \ + -DCMAKE_SYSTEM_NAME=Darwin \ + -DCMAKE_SYSTEM_VERSION=10.10 \ + -DLLVM_ENABLE_THREADS=OFF \ + -DCOMPILER_RT_BUILD_XRAY=OFF \ + -DLIBCXXABI_LIBCXX_INCLUDES=$builddir/llvm/projects/libcxx/include \ + -DCMAKE_OSX_SYSROOT=$sysrootdir \ + -DCMAKE_FIND_ROOT_PATH=$sysrootdir \ + -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ + -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \ + -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ + -DCMAKE_MACOSX_RPATH=ON \ + -DCMAKE_OSX_ARCHITECTURES=x86_64 \ + -DDARWIN_osx_ARCHS=x86_64 \ + -DDARWIN_osx_SYSROOT=$sysrootdir \ + -DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-apple-darwin $builddir/llvm +ninja install -v + +# We now have a native macosx64 toolchain. +# What we want is a native linux64 toolchain which can target macosx64. +# Overlay the linux64 toolchain that we used for this build. Note: we don't do +# any ASan builds for macOS (yet). Once we do we need to preserve at least +# `llvm-symbolizer` as that one seems to get shipped with sanitizer builds (at +# least that's what Mozilla claims). +cd $distdir +cp --remove-destination -lr /var/tmp/dist/clang/* clang/ + +cd cctools/bin ln -s ../../clang/bin/clang x86_64-apple-darwin-clang ln -s ../../clang/bin/clang++ x86_64-apple-darwin-clang++ -cd "/var/tmp/dist" +cd /var/tmp/dist [% c('tar', { tar_src => [ project ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), diff --git a/projects/macosx-toolchain/compiler-rt-cross-compile.patch b/projects/macosx-toolchain/compiler-rt-cross-compile.patch new file mode 100644 index 0000000..4ab2495 --- /dev/null +++ b/projects/macosx-toolchain/compiler-rt-cross-compile.patch @@ -0,0 +1,15 @@ +Add `-target x86_64-apple-darwin' to the compiler-rt overridden CFLAGS + +diff --git a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake +index 28d398672..aac68bf36 100644 +--- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake ++++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake +@@ -265,7 +265,7 @@ endfunction() + macro(darwin_add_builtin_libraries) + set(DARWIN_EXCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Darwin-excludes) + +- set(CFLAGS "-fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer") ++ set(CFLAGS "-fPIC -O3 -fvisibility=hidden -DVISIBILITY_HIDDEN -Wall -fomit-frame-pointer -target x86_64-apple-darwin -isysroot ${CMAKE_OSX_SYSROOT} -I${CMAKE_OSX_SYSROOT}/usr/include") + set(CMAKE_C_FLAGS "") + set(CMAKE_CXX_FLAGS "") + set(CMAKE_ASM_FLAGS "") diff --git a/projects/macosx-toolchain/compiler-rt-no-codesign.patch b/projects/macosx-toolchain/compiler-rt-no-codesign.patch new file mode 100644 index 0000000..99d3f7e --- /dev/null +++ b/projects/macosx-toolchain/compiler-rt-no-codesign.patch @@ -0,0 +1,21 @@ +Disable codesign for macosx cross-compile toolchain. Codesign only works on OSX. + +Index: cmake/Modules/AddCompilerRT.cmake +=================================================================== +--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake ++++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake +@@ -321,14 +321,6 @@ + set_target_properties(${libname} PROPERTIES IMPORT_PREFIX "") + set_target_properties(${libname} PROPERTIES IMPORT_SUFFIX ".lib") + endif() +- if(APPLE) +- # Ad-hoc sign the dylibs +- add_custom_command(TARGET ${libname} +- POST_BUILD +- COMMAND codesign --sign - $<TARGET_FILE:${libname}> +- WORKING_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR} +- ) +- endif() + endif() + + set(parent_target_arg) diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 29f7c4b..937478b 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -1,6 +1,8 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' version: 10.11-1 +gpg_keyring: clang.gpg +sig_ext: sig var: container: use_container: 1 @@ -18,12 +20,37 @@ var: input_files: - project: container-image - - name: clang + - name: clang_compiler project: clang - name: cctools project: cctools + - name: cmake + project: cmake + - name: ninja + project: ninja # Instructions on how to create the SDK tarball can be found at: # build/macosx/cross-mozconfig.common - name: SDK URL: https://people.torproject.org/~gk/mirrors/sources/MacOSX10.11.sdk.tar.bz2 sha256sum: d11e410d757d023be66d2fe7eaa85a1d232da3ac04f177eff3d8b8275cd9ffca + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/llvm-[% pc("clang", "version") %].src.tar.xz' + name: llvm + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/clang-[% pc("clang", "version") %].src.tar.xz' + name: clang + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/libcxx-[% pc("clang", "version") %].src.tar.xz' + name: libcxx + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/libcxxabi-[% pc("clang", "version") %].src.tar.xz' + name: libcxxabi + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/lld-[% pc("clang", "version") %].src.tar.xz' + name: lld + file_gpg_id: 1 + - URL: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-[% pc("clang", "version") %]/compiler-rt-[% pc("clang", "version") %].src.tar.xz' + name: compiler-rt + file_gpg_id: 1 + - filename: compiler-rt-cross-compile.patch + - filename: compiler-rt-no-codesign.patch + - filename: 43909.patch

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_40019_v3'
by sysrqb＠torproject.org 07 Aug '20

07 Aug '20

commit dd4db33fe9cd9eeffd21a239593a15221c8a1e7e Merge: efd0d09 97b5bc0 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Aug 6 23:19:42 2020 +0000 Merge remote-tracking branch 'gkgl/bug_40019_v3' projects/firefox/build | 5 - projects/firefox/config | 6 - projects/macosx-toolchain/43909.patch | 252 +++++++++++++++++++++ projects/macosx-toolchain/build | 95 +++++++- .../compiler-rt-cross-compile.patch | 15 ++ .../macosx-toolchain/compiler-rt-no-codesign.patch | 21 ++ projects/macosx-toolchain/config | 29 ++- 7 files changed, 405 insertions(+), 18 deletions(-)

1 0

[tor-browser-build/master] Bug 40061: Omit the Windows default browser agent from the build
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit 5765d7385f797ae2d55ec5b277cb36a6eac81b49 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 6 11:13:37 2020 -0400 Bug 40061: Omit the Windows default browser agent from the build --- projects/firefox/mozconfig-windows-i686 | 1 + projects/firefox/mozconfig-windows-x86_64 | 1 + 2 files changed, 2 insertions(+) diff --git a/projects/firefox/mozconfig-windows-i686 b/projects/firefox/mozconfig-windows-i686 index eb4e212..f32db84 100644 --- a/projects/firefox/mozconfig-windows-i686 +++ b/projects/firefox/mozconfig-windows-i686 @@ -40,3 +40,4 @@ ac_add_options --disable-tests # Disable telemetry ac_add_options MOZ_TELEMETRY_REPORTING= +ac_add_options --disable-default-browser-agent diff --git a/projects/firefox/mozconfig-windows-x86_64 b/projects/firefox/mozconfig-windows-x86_64 index 655ca12..8dac1e8 100644 --- a/projects/firefox/mozconfig-windows-x86_64 +++ b/projects/firefox/mozconfig-windows-x86_64 @@ -40,3 +40,4 @@ ac_add_options --disable-tests # Disable telemetry ac_add_options MOZ_TELEMETRY_REPORTING= +ac_add_options --disable-default-browser-agent

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gitlab/merge-requests/22' into master
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit efd0d09ea041ec81494afeee716d15d58d99e654 Merge: 219a86f 5765d73 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 6 19:49:09 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/22' into master projects/firefox/mozconfig-windows-i686 | 1 + projects/firefox/mozconfig-windows-x86_64 | 1 + 2 files changed, 2 insertions(+)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'gkgl/bug_33932_v6'
by sysrqb＠torproject.org 07 Aug '20

07 Aug '20

commit 219a86f0d60592414aa460fc761e4dd50243f7b7 Merge: e370ae7 061b9e7 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Aug 6 16:42:18 2020 +0000 Merge remote-tracking branch 'gkgl/bug_33932_v6' .../how-to-create-gradle-dependencies-list.txt | 43 ++++--------- tools/gen_gradle_deps_file.sh | 74 ++++++++++++++++++++++ 2 files changed, 85 insertions(+), 32 deletions(-)

1 0

[tor-browser-build/master] Bug 33932: Improve steps for collecting gradle dependencies
by sysrqb＠torproject.org 07 Aug '20

07 Aug '20

commit 061b9e7bf60d4c442346a404f23a80c01f2b6b9f Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 15 13:54:58 2020 +0000 Bug 33932: Improve steps for collecting gradle dependencies --- .../how-to-create-gradle-dependencies-list.txt | 43 ++++--------- tools/gen_gradle_deps_file.sh | 74 ++++++++++++++++++++++ 2 files changed, 85 insertions(+), 32 deletions(-) diff --git a/projects/common/how-to-create-gradle-dependencies-list.txt b/projects/common/how-to-create-gradle-dependencies-list.txt index e85c56a..3ecdbf6 100644 --- a/projects/common/how-to-create-gradle-dependencies-list.txt +++ b/projects/common/how-to-create-gradle-dependencies-list.txt @@ -3,48 +3,27 @@ If additional Android dependencies are required by the project's build, then the Gradle build will fail due to missing dependencies. To find out what the missing dependencies are take the following steps. -For tor-onion-proxy-library and tor-android-service, replace the following line -in the respective project build file: - $GRADLE_HOME/gradle-4.10.2/bin/gradle --offline --no-daemon -P androidplugin=3.1.0 -Dmaven.repo.local=$gradle_repo assembleRelease -x lint -with - $GRADLE_HOME/gradle-4.10.2/bin/gradle --debug --no-daemon -P androidplugin=3.1.0 assembleRelease -x lint +When calling gradle in the project's build script replace the `--offline` flag +with `--debug` and remove any `-Dmaven.repo.local` arguments. For the firefox project, comment out the following line in the project's build file: - export GRADLE_MAVEN_REPOSITORIES="file://$rootdir/[% c('input_files_by_name/gradle-dependencies') %]" + export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo" Also modify the gradle flags to include the debug option so the download logs will show up: export GRADLE_FLAGS="--no-daemon --debug" -then allow network access during the build by setting -var/container/disable_network/build to 0 in rbm.conf, and rerun the build. +Then allow network access during the build by setting +`var/container/disable_network/build` to `0` in rbm.conf, and rerun the build. Dependent artifacts will show up as downloads in the logs. You can pull out -these dependencies into a list with the following command (replacing -"firefox-android-armv7.log" with the build log file name of the actual project): +these dependencies into a list by passing the log file to the gradle dependency +list script in the tools directory: -`cat logs/firefox-android-armv7.log | grep "Performing HTTP" | grep -o "https://.*" | sort | uniq > download-attempts.txt` +`./gen_gradle_deps_file.sh /path/to/log/file` -The download-attempts.txt file contains all the attempted downloads, so we need to find out which ones failed - -`cat logs/firefox-android-armv7.log | grep "Resource missing" | grep -o "https:.*[^]]" | sort | uniq > download-fails.txt` - -Now take the intersection. This removes failures from attempts, leaving just successful downloads - -`sort download-attempts.txt download-fails.txt | uniq -u | rev | sort -t/ -u -k1,4 | rev | sort > download-urls.txt` - -You will then need to add the new dependency URLs and SHA-256 values into the -projects/$project/gradle-dependencies-list.txt file. The format of this file is -pipe delimited - sha256sum | url - -Finally, in the project's config file increment the -var/gradle_dependencies_version and make sure to restore the project's build +Copy the resulting `gradle-dependencies-list.txt` over the one in the respective +project. Then, in the project's config file, increment the +`var/gradle_dependencies_version` and make sure to restore the project's build file back to original. - -It may also be the case that you wish to clean up old versions of the artifacts. -For this you will need to run the build with a -gradle-dependencies-list.txt file containing only the headers. Make sure to also -comment the GRADLE_MAVEN_REPOSITORIES line from the project's build file. You -can now proceed to reconstruct the list as given above. diff --git a/tools/gen_gradle_deps_file.sh b/tools/gen_gradle_deps_file.sh new file mode 100755 index 0000000..377676f --- /dev/null +++ b/tools/gen_gradle_deps_file.sh @@ -0,0 +1,74 @@ +#!/bin/sh + +# Copyright (c) 2020, The Tor Project, Inc. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# +# * Neither the names of the copyright owners nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Usage: +# 1) Point to a log file with all the dependency download attempts (for its +# generation see: projects/common/how-to-create-gradle-dependencies-list.txt) +# 2) Double-check that you get the same SHA-256 sums when downloaded from a +# different network location. E.g. by using `torsocks` with this script after +# having made a copy of `gradle-dependencies-list.txt` from 1) and comparing +# the two .txt files. + +log="$1" + +# Step 1: Extract all the download attempts out of the log file, ignore the ones +# for maven-metadata.xml files. We don't need those. +cat $log | grep "Performing HTTP" | grep -o "https://.*" | \ + grep -v "maven-metadata.xml" | sort | uniq > dl-attempts + +# Step 2: Fetch all the dependencies and calculate the SHA-256 sum +while read line +do + wget -U "" $line + fn=$(basename "$line") + sha256=`sha256sum $fn | cut -d ' ' -f 1` + echo "$sha256 | $line" >> deps + rm $fn +done < dl-attempts + +# Step 3: Add the header at the beginning of the final dependency file. +echo "# On how to update dependencies see projects/common/how-to-create-gradle\ +-dependencies-list.txt" > gradle-dependencies-list.txt +echo "# Don't forget to update var/gradle_dependencies_version when modifying \ +this file" >> gradle-dependencies-list.txt +echo "sha256sum | url" >> gradle-dependencies-list.txt + +# Step 4: Keep only successfully downloaded artifacts, remove duplicates, and +# sort based on download URL. +grep ^[a-f0-9] deps | rev | sort -t/ -u -k1,4 | rev | \ + sort -k 3 >> gradle-dependencies-list.txt + +# Step 5: Clean up +rm dl-attempts +rm deps + +exit 0

1 0

[tor-browser-build/master] Fold in 9.5.3 Changelog
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit 2c24b79ca9bfd2ed9204b0d7b775c5d1edd56dce Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 6 14:18:58 2020 +0000 Fold in 9.5.3 Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 719a603..bbe2389 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser 9.5.3 -- July 28 2020 + * All Platforms + * Update Firefox to 68.11.0esr + * Update NoScript to 11.0.34 + * Update Tor to 0.4.3.6 + Tor Browser 10.0a3 -- July 7 2020 * Android * Update Firefox to 68.10.1esr

1 0

[tor-browser-build/master] Fold in 10.0a4 Changelog
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit e370ae7adc6b2b15ad0d54912c7293b31a4c3a1a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 6 14:20:11 2020 +0000 Fold in 10.0a4 Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index bbe2389..45ecdf8 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,11 @@ +Tor Browser 10.0a4 -- July 28 2020 + * All Platforms + * Update Firefox to 68.11.0esr + * Update NoScript to 11.0.34 + * Update Tor to 0.4.4.2-alpha + * Windows + OS X + Linux + * Bug 40019: Onion-Location should not be processed on .onion webpages [tor-browser] + Tor Browser 9.5.3 -- July 28 2020 * All Platforms * Update Firefox to 68.11.0esr

1 0

[torbutton/master] Bug 40005: Initialize the identity UI before setting up the circuit display
by gk＠torproject.org 07 Aug '20

07 Aug '20

commit c36ccb5874a318b82310631306f73acfe4ca0eaf Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Jul 31 13:39:09 2020 +0200 Bug 40005: Initialize the identity UI before setting up the circuit display Caused by https://bugzilla.mozilla.org/show_bug.cgi?id=1646780. --- chrome/content/tor-circuit-display.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index 8a51bbfd..1be4571d 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -445,6 +445,10 @@ let ensureCorrectPopupDimensions = function () { // the "enablePref" is set to true, and stopped when it is set to false. // A reference to this function (called createTorCircuitDisplay) is exported as a global. let setupDisplay = function (enablePrefName) { + // From 79 on the identity popup is initialized lazily + if (gIdentityHandler._initializePopup) { + gIdentityHandler._initializePopup(); + } setupGuardNote(); let myController = null, stopCollectingIsolationData = null,

1 0

[torbutton/master] Translations update
by gk＠torproject.org 06 Aug '20

06 Aug '20

commit bce41d2a294b3c4905e9d738862a4e6f1ce95fcc Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 6 13:59:17 2020 +0000 Translations update --- chrome/locale/ar/torbutton.properties | 48 ++++++++++++++++---------------- chrome/locale/es-AR/torbutton.properties | 4 +-- chrome/locale/es-ES/torbutton.properties | 2 +- chrome/locale/fa/torbutton.properties | 2 +- chrome/locale/id/aboutTor.dtd | 2 +- chrome/locale/ja/aboutDialog.dtd | 8 +++--- chrome/locale/ja/aboutTBUpdate.dtd | 2 +- chrome/locale/ja/torbutton.properties | 4 +-- 8 files changed, 36 insertions(+), 36 deletions(-) diff --git a/chrome/locale/ar/torbutton.properties b/chrome/locale/ar/torbutton.properties index 60cbd6b7..34593ee3 100644 --- a/chrome/locale/ar/torbutton.properties +++ b/chrome/locale/ar/torbutton.properties @@ -73,68 +73,68 @@ onionServices.errorPage.onionSite=موقع Onion onionServices.descNotFound.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion onionServices.descNotFound.header=لم يتم العثور على موقع Onion onionServices.descNotFound=على الأغلب أن موقع onion غير متصل.تواصل مع مديرها. -onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client. +onionServices.descNotFound.longDescription=التفاصيل:٪ S - لا يمكن العثور على واصف خدمة البصل المطلوب في التجزئة وبالتالي لا يمكن للعميل الوصول إلى الخدمة. # Tor SOCKS error 0xF1: onionServices.descInvalid.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion onionServices.descInvalid.header=ﻻ يمكن الوصول إلى موقع Onion -onionServices.descInvalid=The onionsite is unreachable due an internal error. -onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed. +onionServices.descInvalid=لا يمكن الوصول إلى موقع onion بسبب خطأ داخلي. +onionServices.descInvalid.longDescription=التفاصيل:٪ S - لا يمكن تحليل واصف خدمة onion المطلوب أو فشل التحقق من صحة التوقيع. # Tor SOCKS error 0xF2: onionServices.introFailed.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion onionServices.introFailed.header=موقع Onion قطع الاتصال. onionServices.introFailed=على الأغلب أن موقع onion غير متصل.تواصل مع مديرها . -onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running. +onionServices.introFailed.longDescription=التفاصيل:٪ S - فشل التقديم ، مما يعني أنه تم العثور على الواصف ولكن الخدمة لم تعد متصلة بنقطة التقديم. من المحتمل أن الخدمة قد غيرت واصفها أو أنها لا تعمل. # Tor SOCKS error 0xF3: onionServices.rendezvousFailed.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion onionServices.rendezvousFailed.header=ﻻ يمكن الاتصال بموقع Onion -onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later. -onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection. +onionServices.rendezvousFailed=موقع onion مشغول أو أن شبكة Tor مكتظة. حاول مرة أخرى في وقت لاحق. +onionServices.rendezvousFailed.longDescription=التفاصيل:٪ S — فشل العميل في التقاء بالخدمة ، مما يعني أن العميل لم يتمكن من إنهاء الاتصال. # Tor SOCKS error 0xF4: onionServices.clientAuthMissing.pageTitle=التحقق مطلوب onionServices.clientAuthMissing.header=يتطلب موقع Onion هذا المصادقة -onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided. -onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing. +onionServices.clientAuthMissing=يتطلب الوصول إلى موقع onion مفتاحًا ولكن لم يتم توفير أي شيء. +onionServices.clientAuthMissing.longDescription=التفاصيل:٪ S — قام العميل بتنزيل واصف خدمة onion المطلوب ولكنه لم يتمكن من فك تشفير محتواه لأن معلومات تخويل العميل مفقودة.عميل # Tor SOCKS error 0xF5: onionServices.clientAuthIncorrect.pageTitle=فشل التحقق -onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed -onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator. -onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked. +onionServices.clientAuthIncorrect.header=فشل مصادقة موقع Onion +onionServices.clientAuthIncorrect=المفتاح المقدم غير صحيح أو تم إبطاله. اتصل بمسؤول موقع onion. +onionServices.clientAuthIncorrect.longDescription=التفاصيل:٪ S — كان العميل قادرًا على تنزيل واصف خدمة onion المطلوب ولكنه لم يتمكن من فك تشفير محتواه باستخدام معلومات مصادقة العميل المقدمة. قد يعني هذا أنه تم إبطال الوصول. # Tor SOCKS error 0xF6: onionServices.badAddress.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion onionServices.badAddress.header=عنوان Onion غير صالح -onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly. -onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. +onionServices.badAddress=عنوان موقع onion المقدم غير صالح. يرجى التحقق من أنك أدخلته بشكل صحيح. +onionServices.badAddress.longDescription=التفاصيل:٪ S — عنوان .onion المقدم غير صالح. تم إرجاع هذا الخطأ لأحد الأسباب التالية: عدم تطابق المجموع الاختباري للعنوان ، أو المفتاح العمومي ed25519 غير صالح ، أو الترميز غير صالح. # Tor SOCKS error 0xF7: onionServices.introTimedOut.pageTitle=حدثت مشكلة أثناء تحميل موقع Onion -onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out -onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. -onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. +onionServices.introTimedOut.header=انتهت مهلة إنشاء دارات موقع Onion +onionServices.introTimedOut=فشل الاتصال بموقع onion ، ربما بسبب ضعف اتصال الشبكة. +onionServices.introTimedOut.longDescription=التفاصيل:٪ S — انتهت مهلة الاتصال بخدمة onion المطلوبة أثناء محاولة بناء دائرة الالتقاء. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description2=%S is requesting that you authenticate. +onionServices.authPrompt.description2=يطلب٪ S منك المصادقة. onionServices.authPrompt.keyPlaceholder=يرجى إدخال المفتاح الخاص لخدمة البصلة هذه onionServices.authPrompt.done=انتهى onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=يرجى إدخال مفتاح صالح (قاعدة٥٢ ب ٣٢ رمز أو قاعدة٤٤ ب ٦٤ رمز) onionServices.authPrompt.failedToSetKey=لا يمكن إعدادا تور باستخدام مفتاحكم -onionServices.authPreferences.header=Onion Services Authentication -onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.header=مصادقة خدمات البصل +onionServices.authPreferences.overview=تتطلب بعض خدمات onion أن تحدد نفسك بمفتاح (نوع من كلمة المرور) قبل أن تتمكن من الوصول إليها. onionServices.authPreferences.savedKeys=تم حفظ المفاتيح -onionServices.authPreferences.dialogTitle=Onion Service Keys -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.dialogTitle=مفاتيح خدمة Onion +onionServices.authPreferences.dialogIntro=يتم تخزين مفاتيح مواقع Onion التالية على جهاز الكمبيوتر الخاص بك onionServices.authPreferences.onionSite=موقع Onion onionServices.authPreferences.onionKey=مفتاح onionServices.authPreferences.remove=حذف onionServices.authPreferences.removeAll=حذف الكل -onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToGetKeys=غير قادر على استرداد المفاتيح من tor onionServices.authPreferences.failedToRemoveKey=لا يمكن حذف المفتاح # Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritize=قم دائمًا بإعطاء الأولوية لل Onions onionLocation.alwaysPrioritizeAccessKey=خ onionLocation.notNow=في وقت آخر onionLocation.notNowAccessKey=ا -onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. +onionLocation.description=هناك نسخة أكثر خصوصية وأمانًا من هذا الموقع متاحة عبر شبكة Tor عبر خدمات Onion. تساعد خدمات Onion ناشري مواقع الويب وزوارهم في التغلب على المراقبة والرقابة. onionLocation.tryThis=جرب خدمة Onion onionLocation.onionAvailable=.onion متوفر onionLocation.learnMore=إطلع على المزيد... diff --git a/chrome/locale/es-AR/torbutton.properties b/chrome/locale/es-AR/torbutton.properties index ad3c948e..be31853d 100644 --- a/chrome/locale/es-AR/torbutton.properties +++ b/chrome/locale/es-AR/torbutton.properties @@ -60,7 +60,7 @@ updateDownloadingPanelUILabel=Descargando actualización %S # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=Conexión encriptada (Servicio Onion, %1$S, claves de %2$S bits, %3$S) pageInfo_OnionEncryption=Conexión encriptada (Servicio Onion) -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=Nombre Onion: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=Aprendé más @@ -111,7 +111,7 @@ onionServices.introTimedOut=No se pudo conectar al sitio Onion, posiblemente deb onionServices.introTimedOut.longDescription=Detalles: %S — El tiempo de espera de conexión al servicio Onion solicitado se agotó al intentar construir el circuito de encuentro. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description2=%S is requesting that you authenticate. +onionServices.authPrompt.description2=%S te está solicitando que te autentiques. onionServices.authPrompt.keyPlaceholder=Ingrese su clave privada para este servicio Onion onionServices.authPrompt.done=Hecho onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/es-ES/torbutton.properties b/chrome/locale/es-ES/torbutton.properties index 0457b931..59b0f505 100644 --- a/chrome/locale/es-ES/torbutton.properties +++ b/chrome/locale/es-ES/torbutton.properties @@ -8,7 +8,7 @@ torbutton.circuit_display.unknown_country = País desconocido torbutton.circuit_display.guard = Protección torbutton.circuit_display.guard_note = Tu nodo [de protección] no puede cambiar. torbutton.circuit_display.learn_more = Conocer más -torbutton.circuit_display.click_to_copy = Click para Copiar +torbutton.circuit_display.click_to_copy = Click para copiar torbutton.circuit_display.copied = ¡Copiado! torbutton.content_sizer.margin_tooltip = El Tor Browser añade este margen para hacer el ancho y el alto de tu ventana menos especial, y reducir de esta forma la posibilidad de rastrearte en línea. torbutton.panel.tooltip.disabled = Haga clic para habilitar Tor diff --git a/chrome/locale/fa/torbutton.properties b/chrome/locale/fa/torbutton.properties index 065da9af..3b87c048 100644 --- a/chrome/locale/fa/torbutton.properties +++ b/chrome/locale/fa/torbutton.properties @@ -111,7 +111,7 @@ onionServices.introTimedOut=اتصال به سایت پیازی، احتمالا onionServices.introTimedOut.longDescription=جزئیات: S% — وقت اتصال به سرویس پیازی درخواست شده اتمام یافت در حالی که سعی داشت تا چرخه ملاقات را ایجاد کند. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description2=%S is requesting that you authenticate. +onionServices.authPrompt.description2=%S از شما می خواهد تا احراز هویت کنید. onionServices.authPrompt.keyPlaceholder=کلید خصوصی خود برای این سرویس Onion را، وارد کنید. onionServices.authPrompt.done=انجام شد onionServices.authPrompt.doneAccessKey=d diff --git a/chrome/locale/id/aboutTor.dtd b/chrome/locale/id/aboutTor.dtd index 3db442d0..be1ecb07 100644 --- a/chrome/locale/id/aboutTor.dtd +++ b/chrome/locale/id/aboutTor.dtd @@ -27,5 +27,5 @@ <!ENTITY aboutTor.newsletter.tagline "Dapatkan berita Tor terbaru langsung dipos-el Anda."> <!ENTITY aboutTor.newsletter.link_text "Daftar untuk mendapatkan Berita Tor."> -<!ENTITY aboutTor.donationBanner.freeToUse "Tor is free to use because of donations from people like you."> +<!ENTITY aboutTor.donationBanner.freeToUse "Tor bebas digunakan karena donasi dari orang-orang seperti Anda."> <!ENTITY aboutTor.donationBanner.buttonA "Donasi Sekarang"> diff --git a/chrome/locale/ja/aboutDialog.dtd b/chrome/locale/ja/aboutDialog.dtd index f85fea1b..d8e538a8 100644 --- a/chrome/locale/ja/aboutDialog.dtd +++ b/chrome/locale/ja/aboutDialog.dtd @@ -9,11 +9,11 @@ <!ENTITY help.or "や">  <!ENTITY help.getInvolvedLink "参加"> -<!ENTITY help.end "で支援してください！"> +<!ENTITY help.end "で支援してください!">  -<!ENTITY bottomLinks.questions "質問がありますか？"> +<!ENTITY bottomLinks.questions "質問がありますか?">  -<!ENTITY bottomLinks.grow "Tor ネットワークを育てましょう！"> +<!ENTITY bottomLinks.grow "Tor ネットワークを育てましょう!">  <!ENTITY bottomLinks.license "ライセンス情報"> -<!ENTITY tor.TrademarkStatement "'Tor' と 'Onion Logo' は Tor Project, Inc. の登録商標です。"> +<!ENTITY tor.TrademarkStatement "「Tor」と「Onion Logo」は Tor Project, Inc. の登録商標です。"> diff --git a/chrome/locale/ja/aboutTBUpdate.dtd b/chrome/locale/ja/aboutTBUpdate.dtd index 26c9820a..53d7bb64 100644 --- a/chrome/locale/ja/aboutTBUpdate.dtd +++ b/chrome/locale/ja/aboutTBUpdate.dtd @@ -1,7 +1,7 @@ <!ENTITY aboutTBUpdate.changelogTitle "Tor Browser 変更履歴"> <!ENTITY aboutTBUpdate.updated "Tor Browser アップデート完了"> <!ENTITY aboutTBUpdate.linkPrefix "このリリースについての最新情報を入手するため、"> -<!ENTITY aboutTBUpdate.linkLabel "我々のウェブサイトを見てください"> +<!ENTITY aboutTBUpdate.linkLabel "私たちのウェブサイトを見てください"> <!ENTITY aboutTBUpdate.linkSuffix "。"> <!ENTITY aboutTBUpdate.version "バージョン"> <!ENTITY aboutTBUpdate.releaseDate "リリース日"> diff --git a/chrome/locale/ja/torbutton.properties b/chrome/locale/ja/torbutton.properties index cc36ba78..c3f8cd23 100644 --- a/chrome/locale/ja/torbutton.properties +++ b/chrome/locale/ja/torbutton.properties @@ -103,7 +103,7 @@ onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was onionServices.badAddress.pageTitle=Onion サイトの読み込み中に問題が発生しました onionServices.badAddress.header=無効な Onion サイトアドレスです onionServices.badAddress=入力された Onion サイトアドレスは有効ではありません。アドレスが正しく入力されているかをご確認ください。 -onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid. +onionServices.badAddress.longDescription=詳細: %S — 提供された .onion アドレスは無効です。このエラーは次の理由で表示されます: アドレスのチェックサムが正しくない、ed25519 公開鍵が違う、エンコーディングが違う。 # Tor SOCKS error 0xF7: onionServices.introTimedOut.pageTitle=Onion サイトの読み込み中に問題が発生しました onionServices.introTimedOut.header=Onion サイトのサーキット作成がタイムアウトしました @@ -111,7 +111,7 @@ onionServices.introTimedOut=ネットワークの接続状態が不安定だっ onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. # # LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description2=%S is requesting that you authenticate. +onionServices.authPrompt.description2=%s はあなたの認証を要求しています。 onionServices.authPrompt.keyPlaceholder=この Onion サービスのあなたの秘密鍵を入力してください onionServices.authPrompt.done=完了 onionServices.authPrompt.doneAccessKey=d

1 0