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

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 19 Jul '17

19 Jul '17

commit 006f475370a859e57ae0837894fcb373132852ca Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 19 22:49:57 2017 +0000 Update translations for tor-browser-manual --- gl/gl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gl/gl.po b/gl/gl.po index 86af459..397bedf 100644 --- a/gl/gl.po +++ b/gl/gl.po @@ -1,7 +1,7 @@ # Translators: # manuel meixide <m.meixide(a)gmail.com>, 2016 # Xan VFR <formularios(a)openaliasbox.org>, 2016 -# Xnake <xnake(a)openaliasbox.org>, 2016 +# Xnake <inactive+Xnake(a)transifex.com>, 2016 # Miguel Anxo Bouzada <mbouzada(a)gmail.com>, 2016 # Eu <luz.armas(a)udc.es>, 2016 msgid ""

1 0

[sandboxed-tor-browser/master] Fix my failure at spelling/formatting in the ChangeLog (No functional changes).
by yawning＠torproject.org 19 Jul '17

19 Jul '17

commit c27917eb5ba8a65a251a34f458e418143bc5f720 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Jul 19 21:04:36 2017 +0000 Fix my failure at spelling/formatting in the ChangeLog (No functional changes). --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 625a7d8..0484a7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,12 @@ Changes in version 0.0.12 - UNRELEASED: * Bug 22969: Disable the addon blocklist. * Bug 22984: Force IDNs to be displayed as punycode to thwart homograph - attacks. + attacks. * Bug 22967: Force disable crashdump reporting. Changes in version 0.0.11 - 2017-07-18: * Bug 22910: Deprecate the volatile extension dir option. - * Bug 22932: Add experimental Amensiac Profile Directory support. + * Bug 22932: Add experimental Amnesiac Profile Directory support. Changes in version 0.0.10 - 2017-07-12: * Bug 22829: Remove default obfs4 bridge riemann.

1 0

[sandboxed-tor-browser/master] Bug 22967: Force disable crashdump reporting.
by yawning＠torproject.org 19 Jul '17

19 Jul '17

commit b94ed0aa5d3c37edd4ad777c85c7fe686d061679 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Jul 19 20:06:06 2017 +0000 Bug 22967: Force disable crashdump reporting. Since crashdumps are developed as a GSOC project, ensure that if/when this makes it to production, that it will be force disabled. --- ChangeLog | 1 + src/cmd/sandboxed-tor-browser/internal/sandbox/application.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index f44a091..625a7d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Changes in version 0.0.12 - UNRELEASED: * Bug 22969: Disable the addon blocklist. * Bug 22984: Force IDNs to be displayed as punycode to thwart homograph attacks. + * Bug 22967: Force disable crashdump reporting. Changes in version 0.0.11 - 2017-07-18: * Bug 22910: Deprecate the volatile extension dir option. diff --git a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go index c4acbad..54d64aa 100644 --- a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go +++ b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go @@ -209,6 +209,9 @@ func RunTorBrowser(cfg *config.Config, manif *config.Manifest, tor *tor.Tor) (pr // Hardware accelerated OpenGL will not work, and never will. h.setenv("LIBGL_ALWAYS_SOFTWARE", "1") + // Crashdumps regardless of being sanitized or not, not to be trusted. + h.setenv("MOZ_CRASHREPORTER_DISABLE", "1") + // Tor Browser currently is incompatible with PaX MPROTECT, apply the // override if needed. realFirefoxPath := filepath.Join(realBrowserHome, "firefox")

1 0

[sandboxed-tor-browser/master] Bug 22984: Force IDNs to be displayed as punycode to thwart homograph attacks.
by yawning＠torproject.org 19 Jul '17

19 Jul '17

commit c8a86652fcaa2bb5d3d0550b99e078844fbf26fe Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Jul 19 19:53:55 2017 +0000 Bug 22984: Force IDNs to be displayed as punycode to thwart homograph attacks. Since no action is being taken by either upstream, unilaterally fix this. --- ChangeLog | 2 ++ data/installer/mozilla.cfg | 3 +++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9a21399..f44a091 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ Changes in version 0.0.12 - UNRELEASED: * Bug 22969: Disable the addon blocklist. + * Bug 22984: Force IDNs to be displayed as punycode to thwart homograph + attacks. Changes in version 0.0.11 - 2017-07-18: * Bug 22910: Deprecate the volatile extension dir option. diff --git a/data/installer/mozilla.cfg b/data/installer/mozilla.cfg index 0ce67a1..dc03adb 100644 --- a/data/installer/mozilla.cfg +++ b/data/installer/mozilla.cfg @@ -34,3 +34,6 @@ lockPref("extensions.getAddons.showPane", false); // Disable the addon blocklist, because it leaks information about the browser // install date among other things to Mozilla. lockPref("extensions.blocklist.enabled", false); + +// Force IDNs to be displayed as punycode to thwart homograph attacks. +defaultPref("network.IDN_show_punycode", true);

1 0

[tor-browser-build/master] Build go-webrtc and snowflake for mac.
by boklm＠torproject.org 19 Jul '17

19 Jul '17

commit 9b59107420ab527696b08ac89d787abd2c67d985 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 19 18:33:12 2017 +0200 Build go-webrtc and snowflake for mac. tor-browser-bundle.git author: David Fifield <david(a)bamsoftware.com> tor-browser-bundle.git commit: 26e0cd44f2886bfad1c3d30844ff7a21eb9d0478 Commit message from the tor-browser-bundle.git commit: Build go-webrtc and snowflake in the mac pluggable-transports descriptor. I had to apply two tricks to get a reproducible snowflake-client. The first is to use faketime to eliminate some timestamps. There were 11 variable timestamps in the file. Through experimentation, I found that 10 of them were dependent on the Go runtime (recompiling Go caused them to change) and 1 was dependent on snowflake-client itself (recompiling snowflake-client with the same runtime changed only that 1 timestamp). The underlying issue has to do with clang 3.8.0 on Darwin embedding timestamps, unsolved in the Go issue tracker as of 13 days ago. https://github.com/golang/go/issues/9206#issuecomment-310476743 The second is a sed command to clobber embedded paths of the form /tmp/go-buildXXXXXXXXX and /tmp/go-link-XXXXXXXXX. Their presence is caused by some combination of Clang and Darwin, and there is as yet no known workaround upstream. --- projects/go-webrtc/config | 28 +++++++++++++++++++++------- projects/go/build | 7 ++++++- projects/go/config | 2 ++ projects/macosx-toolchain/build | 2 ++ projects/macosx-toolchain/config | 2 +- projects/snowflake/build | 36 +++++++++++++++++++++++++++++++++++- projects/snowflake/config | 4 ++++ rbm.conf | 5 ++++- 8 files changed, 75 insertions(+), 11 deletions(-) diff --git a/projects/go-webrtc/config b/projects/go-webrtc/config index 673215b..c97a959 100644 --- a/projects/go-webrtc/config +++ b/projects/go-webrtc/config @@ -20,13 +20,23 @@ var: # Replace the prebuilt webrtc library with our own one. rm -rf include/ lib/ cp -a /var/tmp/dist/webrtc/{include,lib} . - # The go-webrtc package sets _GLIBCXX_USE_CXX11_ABI=0 for compatibility with - # the prebuilt libwebrtc-magic.a libraries. Since we build our own - # libwebrtc-magic.a with the C++11 ABI, we have to undo that setting here, - # using CGO_CXXFLAGS. - # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. - export CGO_CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -D__STDC_FORMAT_MACROS=1" - export CGO_LDFLAGS=-latomic + [% IF c("var/linux") -%] + # The go-webrtc package sets _GLIBCXX_USE_CXX11_ABI=0 for compatibility with + # the prebuilt libwebrtc-magic.a libraries. Since we build our own + # libwebrtc-magic.a with the C++11 ABI, we have to undo that setting here, + # using CGO_CXXFLAGS. + # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. + export CGO_CXXFLAGS="-D_GLIBCXX_USE_CXX11_ABI=1 -D__STDC_FORMAT_MACROS=1" + export CGO_LDFLAGS=-latomic + [% END -%] + [% IF c("var/osx") -%] + export CGO_ENABLED=1 + export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.7" + export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" + export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" + export CC="$clangdir/bin/clang" + export CXX="$clangdir/bin/clang++" + [% END -%] targets: master: @@ -36,6 +46,10 @@ targets: arch_deps: - pkg-config - libx11-dev + osx-x86_64: + var: + arch_deps: + - pkg-config input_files: - project: container-image diff --git a/projects/go/build b/projects/go/build index 98f0522..3b51c32 100644 --- a/projects/go/build +++ b/projects/go/build @@ -52,7 +52,12 @@ cd /var/tmp/dist/go/src # http://golang.org/doc/install/source#environment export GOOS=darwin export GOARCH=amd64 - CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash + # faketime is needed because clang 3.8.0 on Darwin embeds the timestamps of + # certain intermediate object files (including those that arise here while + # compiling the Go runtime itself). Without this, variable timestamps would + # end up in snowflake-client. + # https://github.com/golang/go/issues/9206#issuecomment-310476743 + CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= [% c("var/faketime") %] ./make.bash [% ELSIF c("var/windows") -%] # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. diff --git a/projects/go/config b/projects/go/config index 4b09e95..21669c9 100644 --- a/projects/go/config +++ b/projects/go/config @@ -60,6 +60,8 @@ targets: var: GOOS: darwin GOARCH: amd64 + arch_deps: + - faketime linux: var: GOOS: linux diff --git a/projects/macosx-toolchain/build b/projects/macosx-toolchain/build index e699e4f..f974cfc 100644 --- a/projects/macosx-toolchain/build +++ b/projects/macosx-toolchain/build @@ -10,6 +10,8 @@ tar -C $distdir -xf [% c('input_files_by_name/cctools') %] cd $distdir/cctools/bin ln -s ../../clang/bin/clang x86_64-apple-darwin10-clang ln -s ../../clang/bin/clang++ x86_64-apple-darwin10-clang++ +# "go link" expects to find a program called "dsymutil" exactly. +ln -sf x86_64-apple-darwin10-dsymutil dsymutil cd "/var/tmp/dist" [% c('tar', { diff --git a/projects/macosx-toolchain/config b/projects/macosx-toolchain/config index 1779eb8..bfdbdb6 100644 --- a/projects/macosx-toolchain/config +++ b/projects/macosx-toolchain/config @@ -6,7 +6,7 @@ var: use_container: 1 setup: | mkdir -p /var/tmp/dist - tar -C /var/tmp/dist -xf [% c("compiler_tarfile") %] + tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] export sysrootdir=/var/tmp/dist/[% project %]/SDK/ export clangdir=/var/tmp/dist/[% project %]/clang export cctoolsdir=/var/tmp/dist/[% project %]/cctools/bin diff --git a/projects/snowflake/build b/projects/snowflake/build index 6e08b4e..9d9c1fb 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -10,6 +10,12 @@ distdir=/var/tmp/dist/[% project %] [% IF c("var/osx") %] PTDIR="$distdir/Contents/MacOS/Tor/PluggableTransports" DOCSDIR="$distdir/Contents/Resources/TorBrowser/Docs/snowflake" + export CGO_ENABLED=1 + export CGO_CFLAGS="[% c("var/FLAGS") %] -mmacosx-version-min=10.7" + export CGO_CXXFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" + export CGO_LDFLAGS="[% c("var/FLAGS") %] -stdlib=libc++ -mmacosx-version-min=10.7" + export CC="$clangdir/bin/clang" + export CXX="$clangdir/bin/clang++" [% ELSE %] PTDIR="$distdir/TorBrowser/Tor/PluggableTransports" DOCSDIR="$distdir/TorBrowser/Docs/snowflake" @@ -25,7 +31,35 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] cd client -go build -ldflags '-s' +[% IF c("var/osx") -%] + # Without faketime, snowflake-client would contain the timestamp of the + # temporary client.a file created during "go build". + [% c("var/faketime") %] go build -ldflags '-s' +[% ELSE -%] + go build -ldflags '-s' +[% END -%] +[% IF c("var/osx") -%] + # Hack: Overwrite variable absolute paths embedded in the binary. clang 3.8.0 + # on Darwin embeds such paths and the issue is unsolved in upstream Go as of + # 2016-06-28: + # https://github.com/golang/go/issues/9206#issuecomment-310476743 + # The two kinds of paths are ("000000000" stands for 9 random digits): + # /tmp/go-build000000000 + # /tmp/go-link-000000000 + # Such paths are the output of ioutil.TempDir("", "go-build") and + # ioutil.TempDir("", "go-link-"). + cp -a client client.stomped + sed -i -E -e 's#(/tmp/go-build|/tmp/go-link-)[0-9]{9}/#\1XXXXXXXXX/#g' client.stomped + # Sanity check: make sure the file actually changed. If it did not, it could + # mean that a change in go or clang has made this step unnecessary. + if cmp client client.stomped + then + echo "No paths replaced in snowflake-client. Maybe the replacement failed or is no longer needed." + echo "Check projects/snowflake/build" + exit 1 + fi + mv -f client.stomped client +[% END -%] cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %] cd .. diff --git a/projects/snowflake/config b/projects/snowflake/config index 89e3eb6..4bf438e 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -14,6 +14,10 @@ targets: arch_deps: - pkg-config - libx11-dev + osx-x86_64: + var: + arch_deps: + - faketime input_files: - project: container-image diff --git a/rbm.conf b/rbm.conf index c2143a9..49899ca 100644 --- a/rbm.conf +++ b/rbm.conf @@ -35,6 +35,7 @@ var: [% c("input_files_by_name/" _ file) %] [% END -%] + faketime: "faketime -f \"[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]\"" touch: "[% USE date %]touch -m -t [% date.format(c('timestamp'), format = '%Y%m%d%H%M') %]" locale_ja: ja @@ -130,7 +131,7 @@ targets: var: linux: 1 compiler: gcc - # We only build snowflake on linux for now + # We only build snowflake on linux and osx for now snowflake: 1 container: suite: wheezy @@ -190,6 +191,8 @@ targets: FLAGS: "-target x86_64-apple-darwin10 -mlinker-version=136 -B $cctoolsdir -isysroot $sysrootdir" LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" locale_ja: ja-JP-mac + # We only build snowflake on linux and osx for now + snowflake: 1 deps: - build-essential - python

1 0

[tor-browser-build/master] Set bridges prefs depending on platform
by boklm＠torproject.org 19 Jul '17

19 Jul '17

commit 551dd7a7b870177c5f6d391e73017f9dca5163b9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 19 18:49:17 2017 +0200 Set bridges prefs depending on platform --- projects/tor-browser/build | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 69469db..b9537a3 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -109,7 +109,17 @@ cp -a Bundle-Data/Docs/* $TBDIR/$DOCSPATH tar -C Bundle-Data/[% bundledata_osname %] -c . | tar -C $TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %] -x cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> $TBDIR/$TORCONFIGPATH/torrc-defaults -cat Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH +[% IF c("var/linux") -%] + cat Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH +[% END -%] +[% IF c("var/windows") -%] + # We don't have snowflake available on Windows yet + grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH +[% END -%] +[% IF c("var/osx") -%] + # FTE is temporarily removed due to bug 18495. + grep -Ev 'default_bridge\.fte' Bundle-Data/PTConfigs/bridge_prefs.js >> $TBDIR/$EXTOVERRIDESPATH +[% END -%] cat Bundle-Data/PTConfigs/meek-http-helper-user.js >> $TBDIR/$MEEKPROFILEPATH/user.js [% IF c("var/osx") %]

1 0

[tor-browser-build/master] Bug 22831: Enable Snowflake for mac.
by boklm＠torproject.org 19 Jul '17

19 Jul '17

commit 1d38fb57874499b487e2ac26fa86b4a8bf427a8e Author: David Fifield <david(a)bamsoftware.com> Date: Wed Jul 5 23:10:10 2017 -0700 Bug 22831: Enable Snowflake for mac. --- projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix b/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix index 271b36c..06dbec9 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix +++ b/projects/tor-browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -3,3 +3,6 @@ ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec PluggableTransports/ob ## meek configuration ClientTransportPlugin meek exec PluggableTransports/meek-client-torbrowser -- PluggableTransports/meek-client + +## snowflake configuration +ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client -url https://snowflake-reg.appspot.com/ -front www.google.com -ice stun:stun.l.google.com:19302

1 0

[tor-browser-build/master] Build webrtc for mac.
by boklm＠torproject.org 19 Jul '17

19 Jul '17

commit de79b7e079b44d9b50504413027b632f28fed255 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jul 19 18:27:01 2017 +0200 Build webrtc for mac. tor-browser-bundle.git author: David Fifield <david(a)bamsoftware.com> tor-browser-bundle.git commit: fcdc2be0a2da32a939e172564300d5a09259b75e --- projects/webrtc/build | 99 ++++++++++--- projects/webrtc/config | 11 ++ projects/webrtc/webrtc-mac.patch | 305 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 397 insertions(+), 18 deletions(-) diff --git a/projects/webrtc/build b/projects/webrtc/build index 4905644..43b8261 100644 --- a/projects/webrtc/build +++ b/projects/webrtc/build @@ -1,4 +1,5 @@ #!/bin/bash +set -e [% c("var/set_default_env") -%] [% c("var/setarch") -%] distdir=/var/tmp/dist/[% project %] @@ -10,6 +11,15 @@ mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %] export PATH="/var/tmp/dist/binutils/bin:$PATH" [% END -%] +[% IF c("var/osx") -%] + # src/build/toolchain/mac/filter_libtool.py wants libtool to be called exactly "libtool". + ln -sf x86_64-apple-darwin10-libtool $cctoolsdir/libtool + export AR=x86_64-apple-darwin10-ar + # Certain cross-compiling flags are set in webrtc-mac.patch because the build + # system doesn't honor CFLAGS etc. environment variables. +[% ELSE -%] + AR=ar +[% END -%] # Setting up depot_tools # https://dev.chromium.org/developers/how-tos/install-depot-tools @@ -24,15 +34,48 @@ tar -C /var/tmp/build -xf webrtc-sources-[% c('version') %].tar.gz builddir=/var/tmp/build/[% project %]/src cd $builddir -patch -p1 < $rootdir/webrtc-linux.patch +[% IF c("var/linux") -%] + patch -p1 < $rootdir/webrtc-linux.patch +[% END -%] +[% IF c("var/osx") -%] + patch -p1 < $rootdir/webrtc-mac.patch +[% END -%] + +[% IF c("var/linux") -%] + # First, build a copy of GN, rather than use the prebuilt copy in buildtools/linux64. + cd tools/gn + # __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. + CXXFLAGS=-D__STDC_FORMAT_MACROS=1 LDFLAGS=-latomic ./bootstrap/bootstrap.py --no-rebuild --no-clean + cd ../.. + # This is where bootstrap.py stashes the built gn. + GN="$PWD/out_bootstrap/gn" +[% END -%] +[% IF c("var/osx") -%] + # The linux descriptor builds its own copy of gn, using tools/gn/bootstrap/bootstrap.py. + # I tried that here, but for some reason the gn so built doesn't work. On "gn gen", + # it crashes with this error: + # [0624/022439.767916:FATAL:command_gen.cc(59)] Check failed: !rule.empty(). + # Instead, use the gn packaged with depot_tools. + GN="/var/tmp/dist/depot_tools/gn" + + # Hardcode the output of some utility programs that otherwise require Xcode + # tools, like xcode-select, xcodebuild, sw_vers, and xcrun. This probably + # needs to be kept in sync with the SDK version. + cat <<EOF > build/mac/find_sdk.py +print("$sysrootdir") +print("10.7") +EOF + cat <<EOF > build/config/mac/sdk_info.py +print("machine_os_build=\"10.7\"") +print("sdk_build=\"10.7\"") +print("sdk_path=\"$sysrootdir\"") +print("sdk_platform_path=\"$sysrootdir\"") +print("sdk_version=\"10.7\"") +print("xcode_build=\"7.3\"") +print("xcode_version=\"0730\"") +EOF +[% END -%] -# First, build a copy of GN, rather than use the prebuilt copy in buildtools/linux64. -cd tools/gn -# __STDC_FORMAT_MACROS is needed for a definition of PRIxPTR from inttypes.h. -CXXFLAGS=-D__STDC_FORMAT_MACROS=1 LDFLAGS=-latomic ./bootstrap/bootstrap.py --no-rebuild --no-clean -cd ../.. -# This is where bootstrap.py stashes the built gn. -GN="$PWD/out_bootstrap/gn" [% IF c("var/linux") -%] export CC=gcc @@ -50,7 +93,6 @@ GN="$PWD/out_bootstrap/gn" export GN_ARGS="" # For a list of all possible GN args, do "gn gen out/Release; gn args --list out/Release". # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/cross… -GN_ARGS+=" target_os=\"linux\" target_cpu=\"[% IF c("var/linux-i686") %]x86[% ELSE %]x64[% END %]\"" # Not debug. GN_ARGS+=" is_debug=false" # There are warnings from unused returns. @@ -59,23 +101,44 @@ GN_ARGS+=" treat_warnings_as_errors=false" GN_ARGS+=" is_component_build=false" # Do not use bundled utilities. GN_ARGS+=" is_clang=false use_sysroot=false" -GN_ARGS+=" gold_path=\"$INSTDIR/binutils/bin\"" -# Make extra sure we don't use bundled binutils. -rm -rf third_party/binutils/Linux_* -# Avoid some dependencies. -GN_ARGS+=" use_ozone=true use_gconf=false" -GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false rtc_include_pulse_audio=false" -# Included for "field_trial" below. Maybe "fieldtrial_testing_like_official_build" could help here? -#GN_ARGS+=" rtc_include_tests=false" +[% IF c("var/linux") -%] + GN_ARGS+=" target_os=\"linux\" target_cpu=\"[% IF c("var/linux-i686") %]x86[% ELSE %]x64[% END %]\"" + GN_ARGS+=" gold_path=\"$INSTDIR/binutils/bin\"" + # Make extra sure we don't use bundled binutils. + rm -rf third_party/binutils/Linux_* + # Avoid some dependencies. + GN_ARGS+=" use_ozone=true use_gconf=false" + GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false rtc_include_pulse_audio=false" + # Included for "field_trial" below. Maybe "fieldtrial_testing_like_official_build" could help here? + #GN_ARGS+=" rtc_include_tests=false" +[% END -%] +[% IF c("var/osx") -%] + GN_ARGS+=" target_os=\"mac\" target_cpu=\"x64\" mac_deployment_target=\"10.7\"" + GN_ARGS+=" clang_use_chrome_plugins=false" + GN_ARGS+=" clang_base_path=\"$clangdir\"" + # Avoid some dependencies. + GN_ARGS+=" rtc_include_opus=false rtc_include_ilbc=false rtc_include_internal_audio_device=false" + # Tests are needed for field_trial, metrics_default, and pc_test_utils targets + # (which include code needed by go-webrtc). + GN_ARGS+=" rtc_include_tests=true" + # Make sure not to use bundled clang and binutils. + rm -rf third_party/llvm-build + rm -rf third_party/binutils +[% END -%] rm -rf out/Release "$GN" gen out/Release --args="$GN_ARGS" ninja -C out/Release webrtc field_trial metrics_default pc_test_utils +# The cctools ar doesn't have the 'D' deterministic option of GNU ar, but the +# ZERO_AR_DATE environment variable similarly sets timestamps within the +# archive to zero. +# https://opensource.apple.com/source/cctools/cctools-886/ar/archive.c.auto.h… +# https://codereview.chromium.org/699083004/ # .o files under out/Release/obj/ are the build outputs. Don't include .o # files from elsewhere under out/ because they are build helpers and things # like that, not necessarily of the target architecture, and anyway are not # needed. # https://bugs.torproject.org/22832 -ar crs libwebrtc-magic.a $(find out/Release/obj -name '*.o' | sort) +[% IF c("var/osx") %]ZERO_AR_DATE=1 [% END %]"$AR" crs libwebrtc-magic.a $(find out/Release/obj -name '*.o' | sort) mkdir -p $distdir cd $distdir diff --git a/projects/webrtc/config b/projects/webrtc/config index dff6ecc..da60d2d 100644 --- a/projects/webrtc/config +++ b/projects/webrtc/config @@ -20,6 +20,8 @@ input_files: enable: '[% c("var/linux") %]' - filename: webrtc-linux.patch enable: '[% c("var/linux") %]' + - filename: webrtc-mac.patch + enable: '[% c("var/osx") %]' targets: linux: @@ -44,6 +46,15 @@ targets: var: webrtc: lib_path: lib/libwebrtc-linux-amd64-magic.a + osx-x86_64: + var: + webrtc: + lib_path: lib/libwebrtc-darwin-amd64-magic.a + arch_deps: + - libglib2.0-dev + - libgtk2.0-dev + - pkg-config + - python-biplist steps: fetch_sources: diff --git a/projects/webrtc/webrtc-mac.patch b/projects/webrtc/webrtc-mac.patch new file mode 100644 index 0000000..5c9cedd --- /dev/null +++ b/projects/webrtc/webrtc-mac.patch @@ -0,0 +1,305 @@ +From bd27c327f72ea231353983aa35a0c3e6ae8055d5 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 26 Jun 2017 11:26:55 -0700 +Subject: [PATCH 1/8] Disable assertions that prevent cross-compiling for mac. + +--- + config/BUILDCONFIG.gn | 4 ++-- + toolchain/mac/BUILD.gn | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn +index d055e705..78a2023a 100644 +--- a/build/config/BUILDCONFIG.gn ++++ b/build/config/BUILDCONFIG.gn +@@ -232,8 +232,8 @@ if (target_os == "android") { + } else if (target_os == "ios") { + _default_toolchain = "//build/toolchain/mac:ios_clang_$target_cpu" + } else if (target_os == "mac") { +- assert(host_os == "mac", "Mac cross-compiles are unsupported.") +- _default_toolchain = host_toolchain ++ # assert(host_os == "mac", "Mac cross-compiles are unsupported.") ++ _default_toolchain = "//build/toolchain/mac:clang_$host_cpu" + } else if (target_os == "win") { + # On Windows we use the same toolchain for host and target by default. + assert(target_os == host_os, "Win cross-compiles only work on win hosts.") +diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn +index b417e76a..5f48927d 100644 +--- a/build/toolchain/mac/BUILD.gn ++++ b/build/toolchain/mac/BUILD.gn +@@ -14,7 +14,7 @@ if (is_ios) { + import("//build/config/mac/mac_sdk.gni") + import("//build/config/mac/symbols.gni") + +-assert(host_os == "mac") ++# assert(host_os == "mac") + + import("//build/toolchain/cc_wrapper.gni") + import("//build/toolchain/clang_static_analyzer.gni") +-- +2.11.0 + +From a58bb43ea406939fcc978aa808714d04802074ac Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 26 Jun 2017 11:29:14 -0700 +Subject: [PATCH 2/8] Hardcode cross-compiling flags in config/mac/BUILD.gn. + +The build system doesn't provide a general way to set flags externally. +"No way to provide extra CFLAGS/CXXFLAGS/LDFLAGS" +https://bugs.chromium.org/p/chromium/issues/detail?id=595653 +--- + config/mac/BUILD.gn | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/build/config/mac/BUILD.gn b/build/config/mac/BUILD.gn +index 84180e6a..2054b46f 100644 +--- a/build/config/mac/BUILD.gn ++++ b/build/config/mac/BUILD.gn +@@ -83,6 +83,11 @@ config("runtime_library") { + "-isysroot", + sysroot, + "-mmacosx-version-min=$mac_deployment_target", ++ "-target", ++ "x86_64-apple-darwin10", ++ "-mlinker-version=136", ++ "-B", ++ "/var/tmp/dist/macosx-toolchain/cctools/bin", + ] + + asmflags = common_flags +-- +2.11.0 + +From 4c57d854280a0f0a4f55cba0457ae44f6369ca08 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 26 Jun 2017 11:30:28 -0700 +Subject: [PATCH 3/8] Port build/config/mac/plist_util.py to biplist. + +So as not to require the plutil command. plutil was only being used to +convert between XML and binary plist formats, because versions of the +plistlib module before Python 3.4 only support the XML format. The +biplist library handles both formats natively. + +FAILED: gen/webrtc/examples/AppRTCMobile_info_plist_merged.plist +python ../../build/config/mac/plist_util.py merge -f=xml1 -o=gen/webrtc/examples/AppRTCMobile_info_plist_merged.plist ../../build/config/mac/BuildInfo.plist ../../webrtc/examples/objc/AppRTCMobile/mac/Info.plist +Traceback (most recent call last): + File "../../build/config/mac/plist_util.py", line 254, in <module> + sys.exit(Main()) + File "../../build/config/mac/plist_util.py", line 250, in Main + args.func(args) + File "../../build/config/mac/plist_util.py", line 207, in _Execute + data = MergePList(data, LoadPList(filename)) + File "../../build/config/mac/plist_util.py", line 121, in LoadPList + subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path]) + File "/usr/lib/python2.7/subprocess.py", line 535, in check_call + retcode = call(*popenargs, **kwargs) + File "/usr/lib/python2.7/subprocess.py", line 522, in call + return Popen(*popenargs, **kwargs).wait() + File "/usr/lib/python2.7/subprocess.py", line 710, in __init__ + errread, errwrite) + File "/usr/lib/python2.7/subprocess.py", line 1335, in _execute_child + raise child_exception +OSError: [Errno 2] No such file or directory +--- + config/mac/plist_util.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/build/config/mac/plist_util.py b/build/config/mac/plist_util.py +index 0928fa13..898edc1a 100644 +--- a/build/config/mac/plist_util.py ++++ b/build/config/mac/plist_util.py +@@ -3,7 +3,7 @@ + # found in the LICENSE file. + + import argparse +-import plistlib ++import biplist + import os + import re + import subprocess +@@ -116,6 +116,7 @@ def Interpolate(plist, substitutions): + + def LoadPList(path): + """Loads Plist at |path| and returns it as a dictionary.""" ++ return biplist.readPlist(path) + fd, name = tempfile.mkstemp() + try: + subprocess.check_call(['plutil', '-convert', 'xml1', '-o', name, path]) +@@ -127,6 +128,7 @@ def LoadPList(path): + + def SavePList(path, format, data): + """Saves |data| as a Plist to |path| in the specified |format|.""" ++ return biplist.writePlist(data, path, {"xml1": False, "binary1": True}[format]) # doesn't handle "json" format + fd, name = tempfile.mkstemp() + try: + with os.fdopen(fd, 'w') as f: +-- +2.11.0 + +From d9577991412310d3313d9dcd86453ce24f845c2e Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 26 Jun 2017 11:37:34 -0700 +Subject: [PATCH 4/8] Hack workaround to disable dispatch_queue_get_label. + +dispatch_queue_get_label and DISPATCH_CURRENT_QUEUE_LABEL require SDK +10.9+. I don't know if removing this code even makes sense, but it at +least won't crash immediately because of a null pointer. + +https://developer.apple.com/documentation/dispatch/dispatch_current_queue_label +https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOSX10_9/General.html + +FAILED: obj/webrtc/base/rtc_task_queue/sequenced_task_checker_impl.o ../../../../clang/bin/clang++ -MMD -MF obj/webrtc/base/rtc_task_queue/sequenced_task_checker_impl.o.d -DV8_DEPRECATION_WARNINGS -DNO_TCMALLOC -DUSE_EXTERNAL_POPUP_MENU=1 -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -DENABLE_MEDIA_ROUTER=1 -DFIELDTRIAL_TESTING_ENABLED -DCR_XCODE_VERSION=0730 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D_FORTIFY_SOURCE=2 -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DEXPAT_RELATIVE_PATH -DHAVE_SCTP -DWEBRTC_POSIX -DWEBRTC_MAC -I../.. -Igen -fno-strict-aliasing -fstack-protector -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -arch x86_64 -Wall -Wpartial-availability -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-unused-parameter -O2 -gdwarf-2 -isysroot /home/debian/build/MacOSX10.7.sdk -mmacosx-version-min=10.9 -targ et x86_64-apple-darwin10 -mlinker-version=136 -B /home/debian/build/cctools/bin -fvisibility=hidden -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-strict-overflow -fvisibility-inlines-hidden -std=c++11 -stdlib=libc++ -Wno-narrowing -fno-rtti -fno-exceptions -Wnon-virtual-dtor -Woverloaded-virtual -c ../../webrtc/base/sequenced_task_checker_impl.cc -o obj/webrtc/base/rtc_task_queue/sequenced_task_checker_impl.o +warning: unknown warning option '-Wno-maybe-uninitialized'; did you mean '-Wno-uninitialized'? [-Wunknown-warning-option] +../../webrtc/base/sequenced_task_checker_impl.cc:34:46: error: use of undeclared identifier 'DISPATCH_CURRENT_QUEUE_LABEL' + current_queue = dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL); + ^ +--- + webrtc/base/sequenced_task_checker_impl.cc | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/webrtc/base/sequenced_task_checker_impl.cc b/webrtc/base/sequenced_task_checker_impl.cc +index f03e0b679..352b2162d 100644 +--- a/webrtc/base/sequenced_task_checker_impl.cc ++++ b/webrtc/base/sequenced_task_checker_impl.cc +@@ -30,8 +30,9 @@ bool SequencedTaskCheckerImpl::CalledSequentially() const { + #if defined(WEBRTC_MAC) + // If we're not running on a TaskQueue, use the system dispatch queue + // label as an identifier. +- if (current_queue == nullptr) +- current_queue = dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL); ++ // Disable this because dispatch_queue_get_label requires SDK 10.9+. ++ // if (current_queue == nullptr) ++ // current_queue = dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL); + #endif + CritScope scoped_lock(&lock_); + if (!attached_) { // true if previously detached. +-- +2.11.0 + + +From 62a6fa6376194ce673c220eef19fefeebe58fee1 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 26 Jun 2017 11:41:16 -0700 +Subject: [PATCH 5/8] Include <sys/socket.h> in macifaddrs_converter.cc. + +Without this, when built against MacOSX10.7.sdk, there are errors: + +In file included from ../../webrtc/base/macifaddrs_converter.cc:13: +/home/debian/build/MacOSX10.7.sdk/usr/include/net/if.h:300:19: error: field has incomplete type 'struct sockaddr' + struct sockaddr ifru_addr; + +Related references: +https://trac.macports.org/ticket/49012 +https://trac.macports.org/browser/trunk/dports/gnome/gstreamer1/files/patch-struct-sockadr.diff?rev=140712 +--- + webrtc/base/macifaddrs_converter.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/webrtc/base/macifaddrs_converter.cc b/webrtc/base/macifaddrs_converter.cc +index 2ad070e8e..1995f1940 100644 +--- a/webrtc/base/macifaddrs_converter.cc ++++ b/webrtc/base/macifaddrs_converter.cc +@@ -10,6 +10,7 @@ + + #include <memory> + ++#include <sys/socket.h> + #include <net/if.h> + #include <sys/ioctl.h> + #include <unistd.h> +-- +2.11.0 + + +From e6a421534723408fb1292ce25051a1970f750a4a Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 26 Jun 2017 11:42:34 -0700 +Subject: [PATCH 6/8] Provide definitions of NS_ENUM and NS_OPTIONS. + +--- + webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h +index f9f15c37d..277676d85 100644 +--- a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h ++++ b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCMacros.h +@@ -25,4 +25,17 @@ + #define RTC_FWD_DECL_OBJC_CLASS(classname) typedef struct objc_object classname + #endif + ++// http://iamthewalr.us/blog/2012/11/ns_enum-and-ns_options/ ++#if (__cplusplus && __cplusplus >= 201103L && (__has_extension(cxx_strong_enums) || __has_feature(objc_fixed_enum))) || (!__cplusplus && __has_feature(objc_fixed_enum)) ++#define NS_ENUM(_type, _name) enum _name : _type _name; enum _name : _type ++#if (__cplusplus) ++#define NS_OPTIONS(_type, _name) _type _name; enum : _type ++#else ++#define NS_OPTIONS(_type, _name) enum _name : _type _name; enum _name : _type ++#endif ++#else ++#define NS_ENUM(_type, _name) _type _name; enum ++#define NS_OPTIONS(_type, _name) _type _name; enum ++#endif ++ + #endif // WEBRTC_BASE_OBJC_RTC_MACROS_H_ +-- +2.11.0 + + +From baf5ddbd1e1281cd7c4cdda709e2ea7e07903727 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 26 Jun 2017 11:43:05 -0700 +Subject: [PATCH 7/8] Replace firstObject with objectAtIndex:0. + +firstObject doesn't exist in our version of the SDK. + +The two method calls are not exactly the same; on an empty array, +firstObject returns nil while objectAtIndex:0 raises an exception. Let's +hope that doesn't matter. +--- + webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm b/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm +index 182056228..93bea08f9 100644 +--- a/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm ++++ b/webrtc/modules/video_capture/objc/rtc_video_capture_objc.mm +@@ -176,7 +176,7 @@ using namespace webrtc::videocapturemodule; + } + + - (AVCaptureVideoDataOutput*)currentOutput { +- return [[_captureSession outputs] firstObject]; ++ return [[_captureSession outputs] objectAtIndex:0]; + } + + - (void)startCaptureInBackgroundWithOutput: +-- +2.11.0 + + +From 0b5f86af5bc4b7697ee60adf7e1e057a023438e0 Mon Sep 17 00:00:00 2001 +From: David Fifield <david(a)bamsoftware.com> +Date: Mon, 26 Jun 2017 11:43:51 -0700 +Subject: [PATCH 8/8] Disable the desktop_capture module. + +It's causing an error related to CoreGraphics.h and hopefully we don't +need it. +--- + webrtc/modules/BUILD.gn | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn +index e750a8109..590f34275 100644 +--- a/webrtc/modules/BUILD.gn ++++ b/webrtc/modules/BUILD.gn +@@ -18,7 +18,6 @@ group("modules") { + "audio_processing", + "bitrate_controller", + "congestion_controller", +- "desktop_capture", + "media_file", + "pacing", + "remote_bitrate_estimator", +-- +2.11.0 +

1 0

[webwml/master] Add Nicholas
by atagar＠torproject.org 19 Jul '17

19 Jul '17

commit 3ed8a245422de22b72430cfea314069695730e69 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 19 08:45:13 2017 -0700 Add Nicholas --- about/en/corepeople.wml | 59 ++++++++++++++++++++++----------------- images/people/nickcalyx.png | Bin 0 -> 43384 bytes images/people/orig/nickcalyx.png | Bin 0 -> 550678 bytes 3 files changed, 34 insertions(+), 25 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index fb38866..daabc83 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -506,13 +506,25 @@ table.people tr td:first-child { <tr> <td> + <a id="nickcalyx"></a> + <div class="photo"><img src="$(IMGROOT)/people/nickcalyx.png" alt="nickcalyx" /></div> + <div class="icon"><a href="https://twitter.com/nickcalyx"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> + <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=BC2CB9C4993C086FFDAD8D20…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> + <div class="name"><a href="#nickcalyx">Nicholas Merrill</a></div> + <div class="field"><b>IRC:</b> nickcalyx</div> + <div class="description">Runs a directory authority.</div> + </td> + + <td> <a id="nickhopper"></a> <div class="photo"><img src="$(IMGROOT)/people/nickhopper.png" alt="nickhopper" /></div> <div class="name"><a href="#nickhopper">Nick Hopper</a></div> <div class="field"><b>IRC:</b> nickhopper</div> <div class="description"><a href="https://www-users.cs.umn.edu/~hopper/">Researcher</a> interested in improving Tor's performance and resistance to traffic analysis. Some of my work is described <a href="https://www-users.cs.umn.edu/~hopper/research.html">here</a>.</div> </td> + </tr> + <tr> <td> <a id="nickm"></a> <div class="photo"><img src="$(IMGROOT)/people/nickm.png" alt="nickm" /></div> @@ -522,9 +534,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> nickm</div> <div class="description">One of the three original designers of Tor - does a lot of the ongoing design work, and coordinates and leads ongoing development.</div> </td> - </tr> - <tr> <td> <a id="boklm"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -533,7 +543,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> boklm</div> <div class="description">Works on Tor Browser.</div> </td> + </tr> + <tr> <td> <a id="mrphs"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -543,9 +555,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> mrphs</div> <div class="description">His main area of interests are End-users Accessibility/Security, UX, Censorship, Advocacy and Onion Services.</div> </td> - </tr> - <tr> <td> <a id="syverson"></a> <div class="photo"><img src="$(IMGROOT)/people/syverson.png" alt="syverson" /></div> @@ -553,7 +563,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> syverson</div> <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> researcher on most things Tor. Inventor of <a href="https://www.onion-router.net/">onion routing</a>, and one of the three original designers of Tor.</div> </td> + </tr> + <tr> <td> <a id="pepijn"></a> <div class="photo"><img src="$(IMGROOT)/people/pepijn.png" alt="pepijn" /></div> @@ -562,9 +574,7 @@ table.people tr td:first-child { <div class="name"><a href="#pepijn">Pepijn Le Heux</a></div> <div class="description">Lawyer based in The Netherlands and co-founder of Hart voor Internetvrijheid.</div> </td> - </tr> - <tr> <td> <a id="phw"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -574,7 +584,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> phw</div> <div class="description">Maintains <a href="https://gitweb.torproject.org/user/phw/exitmap.git/">exitmap</a> and <a href="https://gitweb.torproject.org/user/phw/sybilhunter.git/">sybilhunter</a>, works on <a href="https://trac.torproject.org/projects/tor/wiki/doc/ReportingBadRelays">bad relay detection</a>, and does <a href="https://nymity.ch/papers.html">security and privacy research</a>.</div> </td> + </tr> + <tr> <td> <a id="robt"></a> <div class="photo"><img src="$(IMGROOT)/people/robt.png" alt="robt" /></div> @@ -582,9 +594,7 @@ table.people tr td:first-child { <div class="name"><a href="#robt">Rabbi Rob Thomas</a></div> <div class="description">CEO of Team Cymru, which supports Tor through hosting, research, and infosec assistance.</div> </td> - </tr> - <tr> <td> <a id="robgjansen"></a> <div class="photo"><img src="$(IMGROOT)/people/robgjansen.png" alt="robgjansen" /></div> @@ -594,7 +604,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> robgjansen</div> <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> research scientist, <a href="http://www.robgjansen.com/">leading expert in Tor network performance</a>, and author of <a href="https://shadow.github.io/">Shadow</a>.</div> </td> + </tr> + <tr> <td> <a id="arma"></a> <div class="photo"><img src="$(IMGROOT)/people/arma.png" alt="arma" /></div> @@ -604,25 +616,23 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> arma</div> <div class="description">Original developer of Tor along with Nick and Paul. Leading privacy researcher, coordinating developers and researchers.</div> </td> - </tr> - <tr> <td> <a id="roya"></a> <div class="photo"><img src="$(IMGROOT)/people/roya.png" alt="roya" /></div> <div class="name"><a href="#roya">Roya Ensafi</a></div> <div class="description">Detects and understands how to manipulate and circumvent Tor network censorship attempts.</div> </td> + </tr> + <tr> <td> <a id="sebastian"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> <div class="name"><a href="#sebastian">Sebastian Hahn</a></div> <div class="description">Helps people around the world use and understand Tor better. Generally helps everything run smoothly. Runs one of the directory authorities.</div> </td> - </tr> - <tr> <td> <a id="serene"></a> <div class="photo"><img src="$(IMGROOT)/people/serene.png" alt="serene" /></div> @@ -631,7 +641,9 @@ table.people tr td:first-child { <div class="name"><a href="#serene">Serene</a></div> <div class="description">Snowflake and Pluggable Transports developer.</div> </td> + </tr> + <tr> <td> <a id="ssteele"></a> <div class="photo"><img src="$(IMGROOT)/people/ssteele.png" alt="ssteele" /></div> @@ -641,9 +653,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> ssteele</div> <div class="description">Executive Director of the Tor Project, Inc.</div> </td> - </tr> - <tr> <td> <a id="hiro"></a> <div class="photo"><img src="$(IMGROOT)/people/hiro.png" alt="hiro" /></div> @@ -653,7 +663,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> hiro</div> <div class="description">Hiro builds and runs Tor Project's web applications and services.</div> </td> + </tr> + <tr> <td> <a id="inf0"></a> <div class="photo"><img src="$(IMGROOT)/people/inf0.png" alt="inf0" /></div> @@ -663,9 +675,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> inf0</div> <div class="description">Directory authority operator, outreach and trains human rights activists. System's Engineer at Team Cymru and co-Founder of accessnow.org.</div> </td> - </tr> - <tr> <td> <a id="stephw"></a> <div class="photo"><img src="$(IMGROOT)/people/stephw.png" alt="stephw" /></div> @@ -675,7 +685,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> stephw</div> <div class="description">Directs communications to consistently articulate and promote the Tor Project's mission.</div> </td> + </tr> + <tr> <td> <a id="sjmurdoch"></a> <div class="photo"><img src="$(IMGROOT)/people/sjmurdoch.png" alt="sjmurdoch" /></div> @@ -685,9 +697,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> sjmurdoch</div> <div class="description"><a href="http://www.cs.ucl.ac.uk/staff/s.murdoch/">Principal Research Fellow</a> at University College London and original creator of the <a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser</a>.</div> </td> - </tr> - <tr> <td> <a id="sukhe"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -696,7 +706,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> sukhe</div> <div class="description"><a href="https://trac.torproject.org/projects/tor/wiki/torbirdy">TorBirdy</a> and <a href="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger">Tor Messenger</a> developer. Volunteer on the <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam">Community Team</a>.</div> </td> + </tr> + <tr> <td> <a id="catalyst"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -706,9 +718,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> catalyst</div> <div class="description">Software archaeologist and keeper of C language arcana. Works with applied cryptography, protocol design, software security, and technical debt restructuring.</div> </td> - </tr> - <tr> <td> <a id="teor"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -717,7 +727,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> teor</div> <div class="description">Onion services developer, and core member of Tor dev team. Researches Tor network measurement and onion service scalability.</div> </td> + </tr> + <tr> <td> <a id="tjr"></a> <div class="photo"><img src="$(IMGROOT)/people/tjr.png" alt="tjr" /></div> @@ -727,9 +739,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> tjr</div> <div class="description">Maintains <a href="https://consensus-health.torproject.org/">Consensus Health </a>, runs one of the bandwidth authorities, and contributes to Tor Browser.</div> </td> - </tr> - <tr> <td> <a id="t0mmy"></a> <div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" /></div> @@ -738,7 +748,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> t0mmy</div> <div class="description">Writes and edits grant proposals, one-pagers, blogposts, etc.</div> </td> + </tr> + <tr> <td> <a id="wseltzer"></a> <div class="photo"><img src="$(IMGROOT)/people/wseltzer.png" alt="wseltzer" /></div> @@ -748,9 +760,6 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> wseltzer</div> <div class="description"><a href="https://wendy.seltzer.org/">Techie lawyer</a> and former Tor board member. She works on legal and policy support for private and secure communications.</div> </td> - </tr> - - <tr> <td> <a id="yawning"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> diff --git a/images/people/nickcalyx.png b/images/people/nickcalyx.png new file mode 100644 index 0000000..529d7e8 Binary files /dev/null and b/images/people/nickcalyx.png differ diff --git a/images/people/orig/nickcalyx.png b/images/people/orig/nickcalyx.png new file mode 100644 index 0000000..ae82f90 Binary files /dev/null and b/images/people/orig/nickcalyx.png differ

1 0

[webwml/master] Add meejah
by atagar＠torproject.org 19 Jul '17

19 Jul '17

commit c4682277839fb028585546735392e653735acea2 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 19 08:28:59 2017 -0700 Add meejah --- about/en/corepeople.wml | 64 +++++++++++++++++++++++++----------------- images/people/meejah.png | Bin 0 -> 11186 bytes images/people/orig/meejah.svg | 59 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 26 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index e4b087d..fb38866 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -474,6 +474,18 @@ table.people tr td:first-child { </td> <td> + <a id="meejah"></a> + <div class="photo"><img src="$(IMGROOT)/people/meejah.png" alt="meejah" /></div> + <div class="icon"><a href="https://twitter.com/meejah"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> + <div class="icon"><a href="https://meejah.ca/meejah.asc"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> + <div class="name"><a href="#meejah">meejah</a></div> + <div class="field"><b>IRC:</b> meejah</div> + <div class="description"><a href="https://meejah.ca">Author</a> of <a href="https://github.com/meejah/txtorcon">txtorcon</a>, <a href="https://github.com/meejah/carml">carml</a> and other Tor Python tools including some for bad-relay hunting.</div> + </td> + </tr> + + <tr> + <td> <a id="moritz"></a> <div class="photo"><img src="$(IMGROOT)/people/moritz.png" alt="moritz" /></div> <div class="icon"><a href="https://twitter.com/gamamb"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> @@ -481,9 +493,7 @@ table.people tr td:first-child { <div class="name"><a href="#moritz">Moritz Bartl</a></div> <div class="description">Co-founder of <a href="https://www.torservers.net/">torservers.net</a>, a network of non-profit organizations that run Tor exit relays.</div> </td> - </tr> - <tr> <td> <a id="n8fr8"></a> <div class="photo"><img src="$(IMGROOT)/people/n8fr8.png" alt="n8fr8" /></div> @@ -492,7 +502,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> n8fr8</div> <div class="description">Founder of the <a href="https://guardianproject.info/">Guardian Project</a>. Orbot lead developer and contributor to Orfox, Onion Browser and NetCipher SDK. Director of Technology at Tibet Action Institute.</div> </td> + </tr> + <tr> <td> <a id="nickhopper"></a> <div class="photo"><img src="$(IMGROOT)/people/nickhopper.png" alt="nickhopper" /></div> @@ -500,9 +512,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> nickhopper</div> <div class="description"><a href="https://www-users.cs.umn.edu/~hopper/">Researcher</a> interested in improving Tor's performance and resistance to traffic analysis. Some of my work is described <a href="https://www-users.cs.umn.edu/~hopper/research.html">here</a>.</div> </td> - </tr> - <tr> <td> <a id="nickm"></a> <div class="photo"><img src="$(IMGROOT)/people/nickm.png" alt="nickm" /></div> @@ -512,7 +522,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> nickm</div> <div class="description">One of the three original designers of Tor - does a lot of the ongoing design work, and coordinates and leads ongoing development.</div> </td> + </tr> + <tr> <td> <a id="boklm"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -521,9 +533,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> boklm</div> <div class="description">Works on Tor Browser.</div> </td> - </tr> - <tr> <td> <a id="mrphs"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -533,7 +543,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> mrphs</div> <div class="description">His main area of interests are End-users Accessibility/Security, UX, Censorship, Advocacy and Onion Services.</div> </td> + </tr> + <tr> <td> <a id="syverson"></a> <div class="photo"><img src="$(IMGROOT)/people/syverson.png" alt="syverson" /></div> @@ -541,9 +553,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> syverson</div> <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> researcher on most things Tor. Inventor of <a href="https://www.onion-router.net/">onion routing</a>, and one of the three original designers of Tor.</div> </td> - </tr> - <tr> <td> <a id="pepijn"></a> <div class="photo"><img src="$(IMGROOT)/people/pepijn.png" alt="pepijn" /></div> @@ -552,7 +562,9 @@ table.people tr td:first-child { <div class="name"><a href="#pepijn">Pepijn Le Heux</a></div> <div class="description">Lawyer based in The Netherlands and co-founder of Hart voor Internetvrijheid.</div> </td> + </tr> + <tr> <td> <a id="phw"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -562,9 +574,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> phw</div> <div class="description">Maintains <a href="https://gitweb.torproject.org/user/phw/exitmap.git/">exitmap</a> and <a href="https://gitweb.torproject.org/user/phw/sybilhunter.git/">sybilhunter</a>, works on <a href="https://trac.torproject.org/projects/tor/wiki/doc/ReportingBadRelays">bad relay detection</a>, and does <a href="https://nymity.ch/papers.html">security and privacy research</a>.</div> </td> - </tr> - <tr> <td> <a id="robt"></a> <div class="photo"><img src="$(IMGROOT)/people/robt.png" alt="robt" /></div> @@ -572,7 +582,9 @@ table.people tr td:first-child { <div class="name"><a href="#robt">Rabbi Rob Thomas</a></div> <div class="description">CEO of Team Cymru, which supports Tor through hosting, research, and infosec assistance.</div> </td> + </tr> + <tr> <td> <a id="robgjansen"></a> <div class="photo"><img src="$(IMGROOT)/people/robgjansen.png" alt="robgjansen" /></div> @@ -582,9 +594,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> robgjansen</div> <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> research scientist, <a href="http://www.robgjansen.com/">leading expert in Tor network performance</a>, and author of <a href="https://shadow.github.io/">Shadow</a>.</div> </td> - </tr> - <tr> <td> <a id="arma"></a> <div class="photo"><img src="$(IMGROOT)/people/arma.png" alt="arma" /></div> @@ -594,23 +604,25 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> arma</div> <div class="description">Original developer of Tor along with Nick and Paul. Leading privacy researcher, coordinating developers and researchers.</div> </td> + </tr> + <tr> <td> <a id="roya"></a> <div class="photo"><img src="$(IMGROOT)/people/roya.png" alt="roya" /></div> <div class="name"><a href="#roya">Roya Ensafi</a></div> <div class="description">Detects and understands how to manipulate and circumvent Tor network censorship attempts.</div> </td> - </tr> - <tr> <td> <a id="sebastian"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> <div class="name"><a href="#sebastian">Sebastian Hahn</a></div> <div class="description">Helps people around the world use and understand Tor better. Generally helps everything run smoothly. Runs one of the directory authorities.</div> </td> + </tr> + <tr> <td> <a id="serene"></a> <div class="photo"><img src="$(IMGROOT)/people/serene.png" alt="serene" /></div> @@ -619,9 +631,7 @@ table.people tr td:first-child { <div class="name"><a href="#serene">Serene</a></div> <div class="description">Snowflake and Pluggable Transports developer.</div> </td> - </tr> - <tr> <td> <a id="ssteele"></a> <div class="photo"><img src="$(IMGROOT)/people/ssteele.png" alt="ssteele" /></div> @@ -631,7 +641,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> ssteele</div> <div class="description">Executive Director of the Tor Project, Inc.</div> </td> + </tr> + <tr> <td> <a id="hiro"></a> <div class="photo"><img src="$(IMGROOT)/people/hiro.png" alt="hiro" /></div> @@ -641,9 +653,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> hiro</div> <div class="description">Hiro builds and runs Tor Project's web applications and services.</div> </td> - </tr> - <tr> <td> <a id="inf0"></a> <div class="photo"><img src="$(IMGROOT)/people/inf0.png" alt="inf0" /></div> @@ -653,7 +663,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> inf0</div> <div class="description">Directory authority operator, outreach and trains human rights activists. System's Engineer at Team Cymru and co-Founder of accessnow.org.</div> </td> + </tr> + <tr> <td> <a id="stephw"></a> <div class="photo"><img src="$(IMGROOT)/people/stephw.png" alt="stephw" /></div> @@ -663,9 +675,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> stephw</div> <div class="description">Directs communications to consistently articulate and promote the Tor Project's mission.</div> </td> - </tr> - <tr> <td> <a id="sjmurdoch"></a> <div class="photo"><img src="$(IMGROOT)/people/sjmurdoch.png" alt="sjmurdoch" /></div> @@ -675,7 +685,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> sjmurdoch</div> <div class="description"><a href="http://www.cs.ucl.ac.uk/staff/s.murdoch/">Principal Research Fellow</a> at University College London and original creator of the <a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser</a>.</div> </td> + </tr> + <tr> <td> <a id="sukhe"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -684,9 +696,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> sukhe</div> <div class="description"><a href="https://trac.torproject.org/projects/tor/wiki/torbirdy">TorBirdy</a> and <a href="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger">Tor Messenger</a> developer. Volunteer on the <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam">Community Team</a>.</div> </td> - </tr> - <tr> <td> <a id="catalyst"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -696,7 +706,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> catalyst</div> <div class="description">Software archaeologist and keeper of C language arcana. Works with applied cryptography, protocol design, software security, and technical debt restructuring.</div> </td> + </tr> + <tr> <td> <a id="teor"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -705,9 +717,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> teor</div> <div class="description">Onion services developer, and core member of Tor dev team. Researches Tor network measurement and onion service scalability.</div> </td> - </tr> - <tr> <td> <a id="tjr"></a> <div class="photo"><img src="$(IMGROOT)/people/tjr.png" alt="tjr" /></div> @@ -717,7 +727,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> tjr</div> <div class="description">Maintains <a href="https://consensus-health.torproject.org/">Consensus Health </a>, runs one of the bandwidth authorities, and contributes to Tor Browser.</div> </td> + </tr> + <tr> <td> <a id="t0mmy"></a> <div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" /></div> @@ -726,9 +738,7 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> t0mmy</div> <div class="description">Writes and edits grant proposals, one-pagers, blogposts, etc.</div> </td> - </tr> - <tr> <td> <a id="wseltzer"></a> <div class="photo"><img src="$(IMGROOT)/people/wseltzer.png" alt="wseltzer" /></div> @@ -738,7 +748,9 @@ table.people tr td:first-child { <div class="field"><b>IRC:</b> wseltzer</div> <div class="description"><a href="https://wendy.seltzer.org/">Techie lawyer</a> and former Tor board member. She works on legal and policy support for private and secure communications.</div> </td> + </tr> + <tr> <td> <a id="yawning"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> diff --git a/images/people/meejah.png b/images/people/meejah.png new file mode 100644 index 0000000..70807a7 Binary files /dev/null and b/images/people/meejah.png differ diff --git a/images/people/orig/meejah.svg b/images/people/orig/meejah.svg new file mode 100644 index 0000000..1648d00 --- /dev/null +++ b/images/people/orig/meejah.svg @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:export-ydpi="19.769848" inkscape:export-xdpi="19.769848" inkscape:export-filename="/home/mike/mike-wiki.png" width="614.57227" height="622.73328" id="svg2" sodipodi:version="0.32" inkscape:version="0.48.3.1 r9886" sodipodi:docname="mike-self-portrait-final.svg" version="1.1"> + <defs id="defs3"> + <linearGradient id="linearGradient2103"> + <stop id="stop2105" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/> + <stop id="stop2107" offset="1.0000000" style="stop-color:#b8beb3;stop-opacity:1.0000000;"/> + </linearGradient> + <linearGradient id="linearGradient2095"> + <stop id="stop2097" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/> + <stop id="stop2099" offset="1" style="stop-color:#ffffff;stop-opacity:0;"/> + </linearGradient> + <linearGradient inkscape:collect="always" id="linearGradient16606"> + <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop16608"/> + <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop16610"/> + </linearGradient> + <linearGradient inkscape:collect="always" xlink:href="#linearGradient16606" id="linearGradient16612" gradientTransform="scale(1.996266,0.500935)" x1="195.59021" y1="1103.0135" x2="213.26933" y2="1106.2427" gradientUnits="userSpaceOnUse"/> + <linearGradient y2="1106.2427" x2="213.26933" y1="1103.0135" x1="195.59021" gradientTransform="matrix(1.996266,0,0,0.500935,-160,80)" gradientUnits="userSpaceOnUse" id="linearGradient2081" xlink:href="#linearGradient16606" inkscape:collect="always"/> + <linearGradient gradientUnits="userSpaceOnUse" y2="734.25824" x2="99.030327" y1="772.57452" x1="156.67218" gradientTransform="matrix(2.386897,0,0,0.418954,-160,80)" id="linearGradient2101" xlink:href="#linearGradient2103" inkscape:collect="always"/> + <linearGradient gradientUnits="userSpaceOnUse" y2="363.39487" x2="149.47334" y1="374.36395" x1="210.85165" gradientTransform="scale(1.189323,0.840814)" id="linearGradient2884" xlink:href="#linearGradient2103" inkscape:collect="always"/> + </defs> + <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.35" inkscape:cx="-418.75106" inkscape:cy="-23.940959" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="1364" inkscape:window-height="766" inkscape:window-x="0" inkscape:window-y="0" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-maximized="0"/> + <metadata id="metadata4"> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-34.55995,-194.87323)"> + <path style="opacity:0.47872338;fill:#f5c1b6;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 182.85714,476.6479 c 0.47619,9.52381 0.95238,19.04761 1.42857,28.57142 3.33333,2.38095 6.66667,4.76191 10,7.14286 4.28572,8.57143 8.57143,17.14286 12.85715,25.71429 25.23809,36.42857 -8.09524,52.14286 -8.21428,83.03571 -0.0649,16.83123 21.54761,14.10714 22.49999,15.53572 0.71429,15.47619 12.85714,33.80952 6.42857,50.71428 9.52381,11.90476 10.47619,23.80953 15.71429,35.71429 2.38095,8.57143 -8.09524,15.71428 -5.71429,25.71428 1.90476,13.33333 13.80953,26.66667 27.14286,35.71429 29.28571,7.85714 61.42857,10 85,22.14286 28.33333,8.80952 40.95238,11.90475 87.85714,10.71428 32.85715,-8.80953 48.57143,-16.19047 77.14286,-35 -16.90476,-22.85714 -25.23809,-61.42857 -16.42857,-94.28571 8.33333,-26.90476 19.52381,-53.80953 25,-80.71429 18.09524,-20 24.76191,-32.85715 35.71429,-60 5.71429,-12.38095 4.53081,-15.74232 -2.85715,-45.71428 -14.63235,-8.91805 -14.28571,-5.71429 -25.71428,-8.57143 -14. 76191,7.61905 -16.66667,13.80952 -22.85715,27.14285 -3.33333,10.47619 -6.07493,15.72831 -23.69398,19.06165 -13.80952,-10.95238 -2.39497,-13.82355 -16.20449,-24.77593 -1.42857,-22.85715 -35.81581,-35 -44.38724,-56.42857 -43.09524,9.52381 -47.61905,11.19048 -90.71429,20.71429 -45.71428,10 -57.85714,5 -96.42857,2.14285 -28.57143,-1.42857 -53.57143,-4.28571 -53.57143,-4.28571 z" id="path2174" inkscape:connector-curvature="0"/> + <path style="opacity:0.25531915;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 248.57142,533.07647 c -10.08918,3.42032 6.08029,35.05831 15.71429,42.85714 6.16872,4.99364 5.90617,5.99299 36.42857,5 11.16136,-0.36312 36.25691,-7.99132 38.57143,-12.85715 1.61176,-3.38842 -2.03607,-29.98068 -10.71428,-40.71428 -35.37473,0.61052 -60.38642,-0.93489 -80.00001,5.71429 z" id="path5979" inkscape:connector-curvature="0"/> + <path style="fill:#79533b;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 242.85714,645.21933 31.42857,20 54.28572,17.14285 8.57143,25.71429 -37.14286,-20 -37.14286,-5.71429 -25.71428,0 5.71428,-37.14285 z" id="path1407" inkscape:connector-curvature="0"/> + <path style="fill:#79533b;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 231.42857,643.79075 -17.14286,8.57143 -2.85714,14.28572 2.85714,14.28571 5.71429,5.71429 14.28571,-11.42857 -2.85714,-31.42858 z" id="path1409" inkscape:connector-curvature="0"/> + <path style="fill:#f3aeb5;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 237.14286,684.03585 c 0.95238,5.71429 0.8946,15.46918 8.91805,17.14286 13.16994,1.23133 14.21803,1.45251 34.45904,-2.36693 14.85351,-3.07832 13.5446,-4.13634 17.28643,-10.24511 -23.92507,0.17331 -42.79937,1.35678 -60.66352,-4.53082 z" id="path1411" inkscape:connector-curvature="0"/> + <path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 289.64286,530.57647 c -1.0149,3.42528 8.68659,13.81612 15.00001,16.42857 7.49611,3.10184 19.9,-0.6074 24.2857,-4.28572 2.99525,-2.51215 0.21434,-8.14757 -3.57143,-11.42857 -3.35709,-2.90947 -10.24291,-2.25013 -15.71428,-2.14285 -6.67148,0.13081 -3.39585,-1.57472 -20,1.42857 z" id="path9775" inkscape:connector-curvature="0"/> + <path transform="translate(-160,80)" style="fill:#000000;fill-opacity:1;stroke:none" id="path3703" d="m 471.4887,453.34174 c 0,3.0684 -2.48743,5.55583 -5.55584,5.55583 -3.0684,0 -5.55584,-2.48743 -5.55584,-5.55583 0,-3.06841 2.48744,-5.55584 5.55584,-5.55584 3.06841,0 5.55584,2.48743 5.55584,5.55584 z"/> + <path style="fill:#00b700;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 297.14286,535.51519 c 1.797,6.21926 7.24551,10.75444 11.01015,10.92349 2.98188,0.13391 8.98985,-3.86889 8.98985,-6.63778 0,-4.43174 -8.58685,-11.14594 -10,-11.42857 -0.9678,-0.19356 4.48195,6.83854 3.86729,8.98985 -0.33772,1.18202 -5.36524,2.02955 -6.72444,1.01015 -2.45033,-1.83774 -3.69438,-9.48073 -5.2092,-10.08666 -0.86613,-0.34645 -3.00651,3.51642 -1.93365,7.22952 z" id="path3701" inkscape:connector-curvature="0"/> + <path style="opacity:0.25531915;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 165.34088,530.04689 c -10.60979,0.96041 8.25584,36.48799 19.28572,42.14285 9.74015,4.99364 6.62046,5.99299 22.85714,5 11.14644,-0.68168 9.11405,-7.99132 11.42857,-12.85715 1.61176,-3.38842 0.82108,-19.26639 -6.42856,-30.71428 -5.37473,-2.24662 -36.81499,-4.50631 -47.14287,-3.57142 z" id="path6739" inkscape:connector-curvature="0"/> + <path style="fill:#79533b;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 424.87832,458.59043 c 22.8968,37.71236 47.81389,39.05924 50.50763,76.7716 8.08123,9.42809 12.12183,8.75466 18.18275,2.0203 14.81557,-23.57023 15.489,-32.99831 32.32488,-44.44671 21.54992,0.67344 26.9374,1.34687 38.38579,14.14214 0,14.14213 4.04061,24.24366 -4.04061,40.40609 -8.75465,28.28428 -23.57022,44.44673 -38.38579,64.64978 -8.41794,19.86632 -22.8968,76.09816 -25.25382,114.14723 5.38748,35.01863 6.73435,33.67175 22.22336,54.54824 36.70221,-30.6413 37.03892,-28.95771 51.51778,-29.29443 26.26397,5.38748 32.32488,6.73435 54.54824,18.18275 16.83588,-18.18274 23.57022,-26.26397 24.24366,-64.64976 -22.22336,-5.72419 -40.4061,-17.50931 -42.42641,-47.47717 6.06092,-71.38411 0,-80.13878 -14.14213,-119.19801 3.36718,-16.16244 -7.40778,-24.24365 -24.24366,-46.46701 -29.63114,-30.97801 -35.01863,-35.69205 -76.7716,-56.56854 -22.22336,7.7445 -44.44671,15.489 -66.67007,23.2335 z" id="path11293" inkscape:connecto r-curvature="0"/> + <path style="opacity:0.26595746;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 498.61946,554.55493 c -2.69374,10.10152 0.67344,12.12183 -8.08122,26.26396 16.16245,-0.67343 22.22336,-1.34687 30.30458,-8.08122 8.75466,-9.42809 7.40779,-14.81557 8.08122,-28.28427 -4.71405,-4.04061 -9.42809,-8.08122 -14.14214,-12.12183 -5.38748,6.06092 -6.73435,14.14214 -16.16244,22.22336 z" id="path12811" inkscape:connector-curvature="0"/> + <path sodipodi:nodetypes="ccccccccc" id="path16604" d="m 247.875,624.71875 c -9.72063,1.85147 -10.51876,2.80607 -18.1875,8.6875 l 3.65546,1.7914 c 9.68535,-3.85829 5.05601,-3.60617 14.65704,-5.43829 10.53656,2.81577 3.08964,-1.39736 10.82503,2.47033 l 8.54997,1.11406 c -7.68787,-0.81347 -8.46946,-5.72424 -19.28125,-8.59375 l -0.0937,-0.0312 -0.125,0 z" style="opacity:0.11170211;fill:url(#linearGradient2081);fill-opacity:1;fill-rule:evenodd;stroke:none" inkscape:connector-curvature="0"/> + <path sodipodi:nodetypes="czcczc" id="path2083" d="m 215.06246,517.53642 c 2.0203,3.72432 3.95891,7.0915 4.63234,10.45868 0.67344,3.36717 0.0817,8.16291 -0.59173,11.53009 2.69374,1.34687 6.10177,0.55088 8.79551,1.89775 0.65301,-4.2752 4.97849,-10.41317 2.31617,-16.75417 -2.71278,-6.4612 -9.38724,-8.32633 -15.15229,-7.13235 z" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none" inkscape:connector-curvature="0"/> + <path sodipodi:nodetypes="csssss" id="path2087" d="m 207.67857,522.89789 c 0.55297,-1.96052 4.96005,-4.84355 6.78571,-4.28571 2.46006,0.75168 4.45844,4.50986 5.7143,7.5 1.24414,2.96224 0.49667,8.72362 -1.07144,9.64285 -1.88427,1.10458 -5.70862,-1.06576 -8.21429,-3.57142 -2.13719,-2.13719 -3.97084,-6.60338 -3.21428,-9.28572 z" style="fill:#00b700;fill-opacity:1;fill-rule:evenodd;stroke:none" inkscape:connector-curvature="0"/> + <path sodipodi:nodetypes="cssss" id="path2085" d="m 213.21429,519.50504 c -1.07802,0.13788 -1.03903,5.22705 -0.35714,7.5 0.74668,2.48895 4.14757,7.73623 4.64285,6.78571 1.12605,-2.16106 1.47044,-6.05091 0.71429,-8.57143 -0.67242,-2.24138 -2.10246,-6.08489 -5,-5.71428 z" style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" inkscape:connector-curvature="0"/> + <path sodipodi:nodetypes="csccccccccscc" id="path2109" d="m 171.42857,383.79075 c 32.85714,-7.14285 17.31106,-5.21737 60,-5.71428 62.33338,-0.70207 139.52381,17.61905 201.42857,32.85714 16.19048,5.71429 30.95238,8.57143 51.42857,15.71429 32.85715,21.90476 60,38.09524 85.71429,62.85714 5.2381,-11.42857 7.61905,-17.14286 2.85714,-30 8.57143,-26.66666 11.42857,-57.61905 8.57143,-90 7.14286,-15.71428 7.14286,-37.14285 5.71429,-58.57143 -6.19048,-30.95238 -36.66667,-50.47619 -61.42858,-77.14285 C 490,213.79076 470,206.6479 424.28571,198.07647 c -70.47619,-2.38095 -98.94907,-9.29896 -142.85714,15.71429 -26.12114,14.88052 -46.19048,30.47618 -58.57143,48.57142 l -51.42857,121.42857 z" style="opacity:0.70212761;fill:url(#linearGradient2884);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.33149169" inkscape:connector-curvature="0"/> + <path sodipodi:nodetypes="ccsscssscccc" id="path2089" d="m 477.40626,421.21479 c -67.38436,10.81582 -130.483,28.06019 -200.7245,29.59029 -14.18298,-1.42857 -25.85666,1.2039 -35.4061,-0.71428 -30.28807,-6.08392 -86.19464,-20.9851 -138.31911,-20.79479 -22.91364,0.0837 -38.52937,-2.69374 -49.22263,-4.7549 -8.87721,0.55089 -17.28826,4.81603 -18.77448,8.79551 -1.04412,2.79572 -0.07768,8.41551 3.32632,8.67296 8.31743,0.62905 58.16781,7.81656 89.60772,5.46918 10.53626,-0.78666 24.32295,7.75441 105.05586,20.20305 28.99856,2.85714 37.28283,2.14286 84.85281,0 84.00727,-11.11168 100.87168,-15.79479 172.73609,-33.33504 8.47981,-5.8059 0.53106,-13.04036 -13.13198,-13.13198 z" style="fill:#df4261;fill-opacity:1;fill-rule:evenodd;stroke:none" inkscape:connector-curvature="0"/> + <path sodipodi:nodetypes="ccccccsc" id="path2091" d="m 186.48232,459.60059 c -3.36718,6.06091 -5.7242,8.08122 -4.04061,15.15228 33.67175,7.07108 70.37397,8.08123 108.08633,8.08123 21.54992,-0.67343 45.12015,-6.39764 64.64976,-9.09138 58.25213,-11.44839 82.15907,-18.85617 134.35029,-38.38579 -112.12694,25.25382 -112.12693,24.24366 -176.7767,33.33503 -28.62099,0.67344 -46.25133,0.34393 -66.67008,-1.01015 -24.03358,-1.59381 -30.64129,-1.34687 -59.59899,-8.08122 z" style="opacity:0.78723408;fill:#4b1b19;fill-opacity:1;fill-rule:evenodd;stroke:none" inkscape:connector-curvature="0"/> + <path sodipodi:nodetypes="cccsccsc" id="path2093" d="M 170,385.21933 57.14286,423.79076 c 7.61905,3.33333 52.38095,5.23809 82.85714,7.14285 37.14286,3.33334 71.58438,13.04535 105.71429,17.14286 32.7925,3.93695 45.71428,2.38095 87.14285,-1.42857 60.95238,-8.57143 93.33333,-17.14286 140,-25.71429 C 391.42857,405.21933 333.40206,383.30023 241.42857,378.07647 217.75229,376.73174 200.95238,376.6479 170,385.21933 z" style="fill:url(#linearGradient2101);fill-opacity:1;fill-rule:evenodd;stroke:none" inkscape:connector-curvature="0"/> + <path sodipodi:nodetypes="cccsccscc" id="path2111" d="m 460.71429,273.79075 -10,20 c 12.85714,6.19048 22.85714,10.95239 24.28571,18.57144 27.61905,20.47619 30.32251,18.30894 71.42857,44.28571 8.69999,5.49791 12.38095,14.28571 22.85714,30 L 575,368.07647 c -6.66667,-11.90476 -9.45188,-25.60063 -20,-31.42857 -43.85171,-24.22849 -40.47619,-20.95238 -62.85714,-33.57143 -3.33333,-9.76191 -13.80952,-22.38095 -31.42857,-29.28572 z" style="fill:#df4261;fill-opacity:1;fill-rule:evenodd;stroke:none" inkscape:connector-curvature="0"/> + <path sodipodi:nodetypes="ccssccssc" id="path2115" d="m 445.71429,309.50504 c -2.38095,7.14286 -4.76191,14.28571 -7.14286,21.42857 13.80952,10 21.58525,18.67114 35.71428,25.71429 27.94943,13.93245 27.31379,13.13078 68.57143,37.14285 9.84835,5.73177 14.28572,12.38096 25.71429,22.85715 -0.95238,-7.14286 -1.90476,-14.28571 -2.85714,-21.42857 -9.04762,-8.09524 -13.96593,-12.54297 -22.85715,-21.42858 -23.46933,-23.45453 -45.92867,-21.15988 -75,-45.71428 -7.35774,-6.21454 -14.7619,-12.38095 -22.14285,-18.57143 z" style="fill:#df4261;fill-opacity:1;fill-rule:evenodd;stroke:none" inkscape:connector-curvature="0"/> + <path sodipodi:nodetypes="ccscccc" id="path2117" d="m 435.71429,349.50504 -2.85715,18.57143 c 19.52381,13.33333 27.75065,10.89331 54.28572,27.14286 30.69481,18.79689 59.52381,32.85714 82.85714,53.57142 l -2.85714,-22.85714 c -29.28571,-22.14286 -48.57143,-31.42857 -105,-57.85714 -8.80952,-6.19048 -17.61905,-12.38095 -26.42857,-18.57143 z" style="fill:#df4261;fill-opacity:1;fill-rule:evenodd;stroke:none" inkscape:connector-curvature="0"/> + </g> + <g inkscape:groupmode="layer" id="layer2" inkscape:label="face" transform="translate(-34.55995,-194.87323)"/> + <path style="fill:#79533b;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 435.8882,326.42803 c 0,20.95238 -17.59101,40.82282 -16.16244,68.91806 -3.80952,35.71429 -9.04762,48.57143 -28.57143,85.71429 -18.33333,31.19047 -50.95238,33.80953 -76.42857,50.71429 -9.52381,1.90476 -19.04762,3.80952 -28.57143,5.71428 -2.85714,6.19048 -5.71428,12.38096 -8.57142,18.57143 -10.47619,-0.47619 -20.95238,-0.95238 -31.42857,-1.42857 -4.76191,-3.80953 -9.52381,-7.61905 -14.28572,-11.42858 -3.33333,-9.04761 -0.95238,-10.95238 2.85715,-22.85714 -11.42858,-1.90476 -8.57143,-3.80952 -25.71429,-5.71428 -5.2381,-7.14285 -6.19048,-10 -15.71429,-21.42857 -3.33333,12.85714 0.47619,18.57143 2.85715,30 8.09524,8.57143 -2.38095,20 -1.42857,34.28571 3.80952,14.28572 10.47618,27.14286 24.28571,42.85715 17.61904,8.80952 20.95238,9.04761 44.28571,13.57142 21.42858,-2.85714 22.85714,-5.71428 47.14286,-8.57142 29.7619,-8.33333 30.95238,-5.2381 57.85714,-27.85715 14.28572,0.95238 32.85714,0.4762 48.57143,-12.85714 4.52381,-18.33333 3.33334,-25.23809 20.71429,-39.28571 1.90476,-11.42858 8.09523,-31.42857 20,-52.85715 -7.61904,-15.71429 -9.52381,-34.28571 -10,-51.42857 0.95238,-25.95238 -2.03432,-41.31302 0.34663,-75.83683 -7.38095,-3.57143 -4.66039,-15.22409 -12.04134,-18.79552 z" id="path3697" sodipodi:nodetypes="ccccccccccccccccccccccc" inkscape:connector-curvature="0"/> + <path style="fill:#393c4f;fill-opacity:1;fill-rule:evenodd;stroke:none" d="m 129.72576,329.63181 c 16.65705,-0.20565 32.25852,0.87138 48.57143,4.28571 4.16328,0.87138 6.15626,7.37026 10,8.57143 3.77531,1.17978 9.11365,0.17578 12.85715,-1.42857 2.92317,-1.25279 3.87048,-6.77057 7.14285,-7.14286 39.36708,-4.47869 48.20271,-5.19738 86.42857,-7.85714 5.80786,-0.40411 10.32746,9.0746 15.71429,8.57143 37.94651,-3.54445 79.04762,-16.66667 118.57143,-25 2.85714,3.33333 5.71429,6.66667 8.57143,10 -39.52381,8.33333 -79.04762,16.66667 -118.57143,25 -9.04762,1.42857 -6.66667,0 -10,4.28571 0.47619,3.33333 0.95238,6.66667 1.42857,10 -1.90476,0.95238 -3.80953,1.90477 -5.71429,2.85715 -3.80952,-14.28571 -4.76191,-18.57143 -11.42857,-30 -33.80953,0.47619 -47.02443,1.19531 -80,5.71428 -3.26385,0.44728 -3.47313,6.76607 -2.85714,10 1.28877,6.76607 5.71429,13.33333 8.57143,20 -4.76191,-5.23809 -9.52381,-10.47619 -14.28572,-15.71428 -5.23809,0.47619 -10.47619,0.95238 -15.71428,1.42857 -0.95238,3.80952 -1.90476,7.61905 -2.85714,11.42857 -2.85714,-8.57143 -1.80939,-22.07319 -8.57143,-25.71429 -11.80939,-6.3589 -31.42857,-2.85714 -47.14286,-4.28571 -1.42857,1.42857 -2.85714,2.85714 -4.28571,4.28571 2.85714,6.66667 5.71428,13.33333 8.57142,20 -4.7619,-8.09524 -6.53965,-16.71274 -8.57142,-24.28571 -0.58727,-2.18894 0.94275,-4.96755 3.57142,-5 z" id="path3699" sodipodi:nodetypes="csssssscccccccssccccscccss" inkscape:connector-curvature="0"/> +</svg> \ No newline at end of file

1 0