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

[tpo/master] Details for the DARPA contract with Georgetown
by hiro＠torproject.org 14 Jan '20

14 Jan '20

commit b2cdc5bedb78aeb68310f2d6bd11f0b830e3fdd4 Author: Bekeela Davila <bekeela(a)torproject.org> Date: Fri Oct 4 13:16:03 2019 +0000 Details for the DARPA contract with Georgetown --- content/about/sponsors/DARPA-georgetown/contents.lr | 2 +- lego | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/about/sponsors/DARPA-georgetown/contents.lr b/content/about/sponsors/DARPA-georgetown/contents.lr index dcc3b2f..7ead975 100644 --- a/content/about/sponsors/DARPA-georgetown/contents.lr +++ b/content/about/sponsors/DARPA-georgetown/contents.lr @@ -16,4 +16,4 @@ link: https://www.darpa.mil/ --- description: -DARPA's Resilient Anonymous Communication for Everyone (RACE) program researches technologies for a distributed messaging system that can: a) exist completely within a given network, b) provide confidentiality, integrity, and availability of messaging, and c) preserve privacy to any participant in the system. This contract supports our work to develop, integrate and analyze a suite of obfuscated channels to support RACE goals for varying adversarial networks. \ No newline at end of file +DARPA's Resilient Anonymous Communication for Everyone (RACE) program researches technologies for a distributed messaging system that can: a) exist completely within a given network, b) provide confidentiality, integrity, and availability of messaging, and c) preserve privacy to any participant in the system. This contract supports our work to develop, integrate and analyze a suite of obfuscated channels to support RACE goals for varying adversarial networks. diff --git a/lego b/lego index f0ea955..e058aee 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit f0ea955c50f147813fd7735d226e7f4689e94523 +Subproject commit e058aee7e40a97434ddbffbb1d5ffe18a610076b

1 0

[tpo/master] Update contents.lr
by hiro＠torproject.org 14 Jan '20

14 Jan '20

commit 60b9fd466d8cdf60af917de4951240eddbacc8ce Author: Bekeela Davila <bekeela(a)torproject.org> Date: Wed Oct 9 18:08:34 2019 +0000 Update contents.lr --- content/about/sponsors/otf/contents.lr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/about/sponsors/otf/contents.lr b/content/about/sponsors/otf/contents.lr index 7931bf6..98c6273 100644 --- a/content/about/sponsors/otf/contents.lr +++ b/content/about/sponsors/otf/contents.lr @@ -16,4 +16,5 @@ link: https://www.opentech.fund/ --- description: -OTF strives to support technology-centric solutions for anyone affected by censorship, surveillance, and internet blocking in order to protect fundamental human rights. These contracts are used to further our work observing and responding to internet censorship around the world and also to help improve transparency and credibility in Tor metrics and measurement. +OTF strives to support technology-centric solutions for anyone affected by censorship, surveillance, and internet blocking in order to protect fundamental human rights. These contracts are used to further our work observing and responding to internet censorship around the world and also to improve onion services, one of the few censorship circumvention technologies that allows users to route around censorship while simultaneously protecting their privacy and identity. +

1 0

[tpo/master] Delete .gitkeep
by hiro＠torproject.org 14 Jan '20

14 Jan '20

commit b893b22f19e654568b50bbd45809affe63844de1 Author: Bekeela Davila <bekeela(a)torproject.org> Date: Fri Oct 4 13:37:25 2019 +0000 Delete .gitkeep --- content/about/sponsors/DARPA-georgetown/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/content/about/sponsors/DARPA-georgetown/.gitkeep b/content/about/sponsors/DARPA-georgetown/.gitkeep deleted file mode 100644 index e69de29..0000000

1 0

[tpo/master] uploading Georgetown logo
by hiro＠torproject.org 14 Jan '20

14 Jan '20

commit 647ea982ff95278a80c8b0edeaeb43df794d2ec8 Author: Bekeela Davila <bekeela(a)torproject.org> Date: Mon Jan 13 19:50:34 2020 +0000 uploading Georgetown logo --- .../images/sponsors/Georgetown_logotype_S_blueRGB.png | Bin 0 -> 10906 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/sponsors/Georgetown_logotype_S_blueRGB.png b/assets/static/images/sponsors/Georgetown_logotype_S_blueRGB.png new file mode 100644 index 0000000..88b735c Binary files /dev/null and b/assets/static/images/sponsors/Georgetown_logotype_S_blueRGB.png differ

1 0

[tpo/master] Updated the contents since we have a new contract with Georgetown - Sponsor 38. There are also two images - Georgetown's logo and NSF's logo.
by hiro＠torproject.org 14 Jan '20

14 Jan '20

commit eb0283f7170bf8dffa10cff8597a600e13adb4be Author: Bekeela Davila <bekeela(a)torproject.org> Date: Mon Jan 13 22:24:09 2020 +0000 Updated the contents since we have a new contract with Georgetown - Sponsor 38. There are also two images - Georgetown's logo and NSF's logo. --- content/about/sponsors/nsf-georgetown/contents.lr | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/content/about/sponsors/nsf-georgetown/contents.lr b/content/about/sponsors/nsf-georgetown/contents.lr index 90414c5..923fae7 100644 --- a/content/about/sponsors/nsf-georgetown/contents.lr +++ b/content/about/sponsors/nsf-georgetown/contents.lr @@ -1,14 +1,14 @@ _model: sponsor --- -active: False +active: true --- -time: 2015 - 2019 +time: 2015 - 2020 --- -name: National Science Foundation joint with Georgetown +name: National Science Foundation via Georgetown --- key: 09 --- -logo: /static/images/sponsors/nsf-georgetown.png +logo: /static/images/sponsors/nsf.png /static/images/sponsors/Georgetown_logotype_S_blueRGB.png --- _hidden: yes --- @@ -16,5 +16,4 @@ link: https://nsf.gov/ --- description: -The National Science Foundation funds research and education in most fields of science and engineering. -We are using this grant to study how internet infrastructure attacks apply to anonymity networks, design defenses that improve the resilience against such threats, and transition such defenses to the deployed Tor network. +The National Science Foundation funds research and education in most fields of science and engineering. This contract supports building a novel Anonymous Communication Experimentation (ACE) software framework and developing a user interface, a toolkit to model inputs and visualize outputs, and a data repository to share and archive results.

1 0

[tpo/master] Add new directory for RIPE sponsor
by hiro＠torproject.org 14 Jan '20

14 Jan '20

commit 45260a55343f3cb7c3dc18ec2c99eb87103315f2 Author: Bekeela Davila <bekeela(a)torproject.org> Date: Mon Jan 6 21:33:19 2020 +0000 Add new directory for RIPE sponsor --- content/about/sponsors/RIPE NCC/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/content/about/sponsors/RIPE NCC/.gitkeep b/content/about/sponsors/RIPE NCC/.gitkeep new file mode 100644 index 0000000..e69de29

1 0

[tpo/master] Update RIPE NCC, there was a typo in the decsription
by hiro＠torproject.org 14 Jan '20

14 Jan '20

commit f68b3889628f099cac5d434863cca669387994d9 Author: Bekeela Davila <bekeela(a)torproject.org> Date: Mon Jan 13 19:58:56 2020 +0000 Update RIPE NCC, there was a typo in the decsription --- content/about/sponsors/ripe-ncc/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/sponsors/ripe-ncc/contents.lr b/content/about/sponsors/ripe-ncc/contents.lr index d340c2f..b84c351 100644 --- a/content/about/sponsors/ripe-ncc/contents.lr +++ b/content/about/sponsors/ripe-ncc/contents.lr @@ -16,4 +16,4 @@ link: https://www.ripe.net/ --- description: -RIPE NCC (Network Coordination Centre) an independent, not-for-profit membership organization that supports the infrastructure of the Internet through technical coordination in their service region. RIPE NCC’s most prominent activity is to act as the Regional Internet Registry (RIR) providing global Internet resources and related services (IPv4, IPv6 and AS Number resources) to members in their service region. RIPE is supporting a project t improve the Tor network’s IPv6 support. We will do so by improving our software and increasing the number of Tor network relays that support IPv6. +RIPE NCC (Network Coordination Centre) an independent, not-for-profit membership organization that supports the infrastructure of the Internet through technical coordination in their service region. RIPE NCC’s most prominent activity is to act as the Regional Internet Registry (RIR) providing global Internet resources and related services (IPv4, IPv6 and AS Number resources) to members in their service region. RIPE is supporting a project to improve the Tor network’s IPv6 support. We will do so by improving our software and increasing the number of Tor network relays that support IPv6.

1 0

[tor/master] Add changes file
by dgoulet＠torproject.org 14 Jan '20

14 Jan '20

commit 52bbc7fb4955fa75358aa674a2b9c80c5620ba74 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Dec 30 12:58:46 2019 +0700 Add changes file --- changes/ticket32772 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket32772 b/changes/ticket32772 new file mode 100644 index 000000000..217ae4843 --- /dev/null +++ b/changes/ticket32772 @@ -0,0 +1,4 @@ + o Minor features (developer tooling): + - Remove 0.2.9 series branches from git scripts (git-merge-forward.sh, + git-pull-all.sh, git-push-all.sh, git-setup-dirs.sh). Closes ticket + 32772.

1 0

[tor/master] Remove 0.2.9 from git scripts
by dgoulet＠torproject.org 14 Jan '20

14 Jan '20

commit c0dd214c8a6075499368e2be79d01205be715f97 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Dec 30 12:41:08 2019 +0700 Remove 0.2.9 from git scripts --- scripts/git/git-merge-forward.sh | 21 ++++++--------------- scripts/git/git-pull-all.sh | 7 ------- scripts/git/git-push-all.sh | 9 +-------- scripts/git/git-setup-dirs.sh | 7 ------- 4 files changed, 7 insertions(+), 37 deletions(-) diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index a6df47959..c6e02294c 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -11,8 +11,8 @@ function usage() echo " -n: dry run mode" echo " (default: run commands)" echo " -t: test branch mode: create new branches from the commits checked" - echo " out in each maint directory. Call these branches prefix_029," - echo " prefix_035, ... , prefix_master." + echo " out in each maint directory. Call these branches prefix_035," + echo " prefix_040, ... , prefix_master." echo " (default: merge forward maint-*, release-*, and master)" echo " -u: in test branch mode, if a prefix_* branch already exists," echo " skip creating that branch. Use after a merge error, to" @@ -89,8 +89,6 @@ TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"} # Only used in test branch mode # There is no previous branch to merge forward, so the second and fifth items # must be blank ("") -MAINT_029_TB=( "maint-0.2.9" "" "$GIT_PATH/$TOR_WKT_NAME/maint-0.2.9" \ - "_029" "") # Used in maint/release merge and test branch modes MAINT_035=( "maint-0.3.5" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" \ "_035" "_029") @@ -103,7 +101,6 @@ MAINT_042=( "maint-0.4.2" "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" \ MAINT_MASTER=( "master" "maint-0.4.2" "$GIT_PATH/$TOR_MASTER_NAME" \ "_master" "_042") -RELEASE_029=( "release-0.2.9" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" ) RELEASE_035=( "release-0.3.5" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" ) RELEASE_040=( "release-0.4.0" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" ) RELEASE_041=( "release-0.4.1" "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" ) @@ -116,13 +113,11 @@ ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME" # SC2034 -- shellcheck thinks that these are unused. We know better. ACTUALLY_THESE_ARE_USED=<<EOF -${MAINT_029_TB[0]} ${MAINT_035[0]} ${MAINT_040[0]} ${MAINT_041[0]} ${MAINT_042[0]} ${MAINT_MASTER[0]} -${RELEASE_029[0]} ${RELEASE_035[0]} ${RELEASE_040[0]} ${RELEASE_041[0]} @@ -139,7 +134,7 @@ DRY_RUN=0 # Controlled by the -t <test-branch-prefix> option. The test branch base # name option makes git-merge-forward.sh create new test branches: -# <tbbn>_029, <tbbn>_035, ... , <tbbn>_master, and merge forward. +# <tbbn>_035, <tbbn>_040, ... , <tbbn>_master, and merge forward. TEST_BRANCH_PREFIX= # Controlled by the -u option. The use existing option checks for existing @@ -180,8 +175,6 @@ if [ -z "$TEST_BRANCH_PREFIX" ]; then # List of all worktrees to work on. All defined above. Ordering is important. # Always the maint-* branch BEFORE then the release-*. WORKTREE=( - RELEASE_029[@] - MAINT_035[@] RELEASE_035[@] @@ -199,10 +192,8 @@ if [ -z "$TEST_BRANCH_PREFIX" ]; then else - # Test branch mode: merge to maint only, and create a new branch for 0.2.9 + # Test branch mode: merge to maint only WORKTREE=( - MAINT_029_TB[@] - MAINT_035[@] MAINT_040[@] @@ -427,9 +418,9 @@ for ((i=0; i<COUNT; i++)); do fi # Merge the previous branch into the target branch # Merge Forward Example: - # merge maint-0.2.9 into maint-0.3.5. + # merge maint-0.3.5 into maint-0.4.0. # Test Branch Example: - # merge bug99999_029 into bug99999_035. + # merge bug99999_035 into bug99999_040. # Skip the merge if the previous branch does not exist # (there's nothing to merge forward into the oldest test branch) if [ "$target_previous" ]; then diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh index 9e12b565b..6e02093ad 100755 --- a/scripts/git/git-pull-all.sh +++ b/scripts/git/git-pull-all.sh @@ -58,14 +58,12 @@ TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"} # # First set of arrays are the maint-* branch and then the release-* branch. # New arrays need to be in the WORKTREE= array else they aren't considered. -MAINT_029=( "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.2.9" ) MAINT_035=( "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" ) MAINT_040=( "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" ) MAINT_041=( "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" ) MAINT_042=( "maint-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" ) MAINT_MASTER=( "master" "$GIT_PATH/$TOR_MASTER_NAME" ) -RELEASE_029=( "release-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" ) RELEASE_035=( "release-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" ) RELEASE_040=( "release-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" ) RELEASE_041=( "release-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" ) @@ -78,13 +76,11 @@ ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME" # SC2034 -- shellcheck thinks that these are unused. We know better. ACTUALLY_THESE_ARE_USED=<<EOF -${MAINT_029[0]} ${MAINT_035[0]} ${MAINT_040[0]} ${MAINT_041[0]} ${MAINT_042[0]} ${MAINT_MASTER[0]} -${RELEASE_029[0]} ${RELEASE_035[0]} ${RELEASE_040[0]} ${RELEASE_041[0]} @@ -98,9 +94,6 @@ EOF # List of all worktrees to work on. All defined above. Ordering is important. # Always the maint-* branch first then the release-*. WORKTREE=( - MAINT_029[@] - RELEASE_029[@] - MAINT_035[@] RELEASE_035[@] diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index 293df0342..671fed2c1 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -21,7 +21,7 @@ function usage() echo " -r: push to remote-name, rather than the default upstream remote." echo " (default: $DEFAULT_UPSTREAM_REMOTE, current: $UPSTREAM_REMOTE)" echo " -t: test branch mode: push test branches to remote-name. Pushes" - echo " branches prefix_029, prefix_035, ... , prefix_master." + echo " branches prefix_035, prefix_040, ... , prefix_master." echo " (default: push maint-*, release-*, and master)" echo " -s: push branches whose tips match upstream maint, release, or" echo " master branches. The default is to skip these branches," @@ -175,7 +175,6 @@ if [ "$DEFAULT_UPSTREAM_REMOTE" != "$UPSTREAM_REMOTE" ]; then "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.1 \ "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.0 \ "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.3.5 \ - "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.2.9 \ ) fi @@ -185,7 +184,6 @@ UPSTREAM_BRANCHES=$(echo \ "$UPSTREAM_REMOTE"/{release,maint}-0.4.1 \ "$UPSTREAM_REMOTE"/{release,maint}-0.4.0 \ "$UPSTREAM_REMOTE"/{release,maint}-0.3.5 \ - "$UPSTREAM_REMOTE"/{release,maint}-0.2.9 \ ) ######################## @@ -198,7 +196,6 @@ PUSH_BRANCHES=$(echo \ {release,maint}-0.4.1 \ {release,maint}-0.4.0 \ {release,maint}-0.3.5 \ - {release,maint}-0.2.9 \ ) if [ -z "$TEST_BRANCH_PREFIX" ]; then @@ -212,12 +209,9 @@ if [ -z "$TEST_BRANCH_PREFIX" ]; then {release,maint}-0.4.1 \ {release,maint}-0.4.0 \ {release,maint}-0.3.5 \ - {release,maint}-0.2.9 \ ) else - # Test branch mode: merge to maint only, and create a new branch for 0.2.9 - # # List of branches to push. Ordering is not important. PUSH_BRANCHES=" \ ${TEST_BRANCH_PREFIX}_master \ @@ -225,7 +219,6 @@ else ${TEST_BRANCH_PREFIX}_041 \ ${TEST_BRANCH_PREFIX}_040 \ ${TEST_BRANCH_PREFIX}_035 \ - ${TEST_BRANCH_PREFIX}_029 \ " fi diff --git a/scripts/git/git-setup-dirs.sh b/scripts/git/git-setup-dirs.sh index b7a37a04e..20a148204 100755 --- a/scripts/git/git-setup-dirs.sh +++ b/scripts/git/git-setup-dirs.sh @@ -96,14 +96,12 @@ GITHUB_PUSH=${TOR_GITHUB_PUSH:-"No_Pushing_To_GitHub"} # # First set of arrays are the maint-* branch and then the release-* branch. # New arrays need to be in the WORKTREE= array else they aren't considered. -MAINT_029=( "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.2.9" ) MAINT_035=( "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" ) MAINT_040=( "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" ) MAINT_041=( "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" ) MAINT_042=( "maint-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" ) MAINT_MASTER=( "master" "$GIT_PATH/$TOR_MASTER_NAME" ) -RELEASE_029=( "release-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" ) RELEASE_035=( "release-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" ) RELEASE_040=( "release-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" ) RELEASE_041=( "release-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" ) @@ -116,13 +114,11 @@ ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME" # SC2034 -- shellcheck thinks that these are unused. We know better. ACTUALLY_THESE_ARE_USED=<<EOF -${MAINT_029[0]} ${MAINT_035[0]} ${MAINT_040[0]} ${MAINT_041[0]} ${MAINT_042[0]} ${MAINT_MASTER[0]} -${RELEASE_029[0]} ${RELEASE_035[0]} ${RELEASE_040[0]} ${RELEASE_041[0]} @@ -166,9 +162,6 @@ done ########################### WORKTREE=( - MAINT_029[@] - RELEASE_029[@] - MAINT_035[@] RELEASE_035[@]

1 0

[tor/master] Merge branch 'tor-github/pr/1633'
by dgoulet＠torproject.org 14 Jan '20

14 Jan '20

commit b958529dbfbacbf8c17ab9fd761fe773125f4572 Merge: 08bbb6b8d 52bbc7fb4 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jan 14 14:03:21 2020 -0500 Merge branch 'tor-github/pr/1633' changes/ticket32772 | 4 ++++ scripts/git/git-merge-forward.sh | 21 ++++++--------------- scripts/git/git-pull-all.sh | 7 ------- scripts/git/git-push-all.sh | 9 +-------- scripts/git/git-setup-dirs.sh | 7 ------- 5 files changed, 11 insertions(+), 37 deletions(-)

1 0