May 2021 - tor-commits - lists.torproject.org

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by nickm＠torproject.org 28 May '21

28 May '21

commit cae7051a8e4f8e1ac875362a66fe9e80dcdddf77 Merge: 2af341b2ea aaf062119e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 28 08:05:14 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[Git][tpo/applications/fenix] Pushed new branch tor-browser-89.1.1-10.5-1
by Matthew Finkel (＠sysrqb) 28 May '21

28 May '21

Matthew Finkel pushed new branch tor-browser-89.1.1-10.5-1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-89.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix] Pushed new branch tor-browser-89.1.0-10.5-1
by Matthew Finkel (＠sysrqb) 28 May '21

28 May '21

Matthew Finkel pushed new branch tor-browser-89.1.0-10.5-1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-89.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor/main] Merge branch 'maint-0.4.6'
by nickm＠torproject.org 28 May '21

28 May '21

commit 2ddd45bdb8dcf018eebe19b84e637c8bfb630ec1 Merge: 896ab165d9 e1f0b9fb1e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 28 08:03:43 2021 -0400 Merge branch 'maint-0.4.6' scripts/git/git-resquash.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/main] Stop using the "x$FOO" idiom in git-resquash.sh
by nickm＠torproject.org 28 May '21

28 May '21

commit 8b6e919086ad6dde681516fe52d744afa3ffcc89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 28 08:02:08 2021 -0400 Stop using the "x$FOO" idiom in git-resquash.sh The new version of shellcheck says that that this idiom is unnecessary, and its presence here is making the shellcheck tests fail. No changes file needed, since this is not user-facing code. --- scripts/git/git-resquash.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/git/git-resquash.sh b/scripts/git/git-resquash.sh index e0f26ecdc4..f37950c9b0 100755 --- a/scripts/git/git-resquash.sh +++ b/scripts/git/git-resquash.sh @@ -7,7 +7,7 @@ set -e PARENT="$1" -if test "x$PARENT" = "x"; then +if test "$PARENT" = ""; then echo "You must specify the parent branch." exit 1 fi @@ -32,12 +32,12 @@ else USE_KEEP_BASE=1 fi -if test "x$USE_KEEP_BASE" = "x1" ; then +if test "$USE_KEEP_BASE" = "1" ; then exec git rebase -i --autosquash --keep-base "${PARENT}" else REV=$(git log --reverse --format='%H' "${PARENT}..HEAD" | head -1) - if test "x${REV}" = "x"; then + if test "${REV}" = ""; then echo "No changes here since ${PARENT}" exit 1 fi

1 0

[tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 28 May '21

28 May '21

commit e1f0b9fb1eb6cf8e57655bb9db4224b5ce080d0f Merge: fd3678fa60 8b6e919086 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 28 08:03:43 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 scripts/git/git-resquash.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.5] Stop using the "x$FOO" idiom in git-resquash.sh
by nickm＠torproject.org 28 May '21

28 May '21

commit 8b6e919086ad6dde681516fe52d744afa3ffcc89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 28 08:02:08 2021 -0400 Stop using the "x$FOO" idiom in git-resquash.sh The new version of shellcheck says that that this idiom is unnecessary, and its presence here is making the shellcheck tests fail. No changes file needed, since this is not user-facing code. --- scripts/git/git-resquash.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/git/git-resquash.sh b/scripts/git/git-resquash.sh index e0f26ecdc4..f37950c9b0 100755 --- a/scripts/git/git-resquash.sh +++ b/scripts/git/git-resquash.sh @@ -7,7 +7,7 @@ set -e PARENT="$1" -if test "x$PARENT" = "x"; then +if test "$PARENT" = ""; then echo "You must specify the parent branch." exit 1 fi @@ -32,12 +32,12 @@ else USE_KEEP_BASE=1 fi -if test "x$USE_KEEP_BASE" = "x1" ; then +if test "$USE_KEEP_BASE" = "1" ; then exec git rebase -i --autosquash --keep-base "${PARENT}" else REV=$(git log --reverse --format='%H' "${PARENT}..HEAD" | head -1) - if test "x${REV}" = "x"; then + if test "${REV}" = ""; then echo "No changes here since ${PARENT}" exit 1 fi

1 0

[tor/maint-0.4.6] Stop using the "x$FOO" idiom in git-resquash.sh
by nickm＠torproject.org 28 May '21

28 May '21

commit 8b6e919086ad6dde681516fe52d744afa3ffcc89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 28 08:02:08 2021 -0400 Stop using the "x$FOO" idiom in git-resquash.sh The new version of shellcheck says that that this idiom is unnecessary, and its presence here is making the shellcheck tests fail. No changes file needed, since this is not user-facing code. --- scripts/git/git-resquash.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/git/git-resquash.sh b/scripts/git/git-resquash.sh index e0f26ecdc4..f37950c9b0 100755 --- a/scripts/git/git-resquash.sh +++ b/scripts/git/git-resquash.sh @@ -7,7 +7,7 @@ set -e PARENT="$1" -if test "x$PARENT" = "x"; then +if test "$PARENT" = ""; then echo "You must specify the parent branch." exit 1 fi @@ -32,12 +32,12 @@ else USE_KEEP_BASE=1 fi -if test "x$USE_KEEP_BASE" = "x1" ; then +if test "$USE_KEEP_BASE" = "1" ; then exec git rebase -i --autosquash --keep-base "${PARENT}" else REV=$(git log --reverse --format='%H' "${PARENT}..HEAD" | head -1) - if test "x${REV}" = "x"; then + if test "${REV}" = ""; then echo "No changes here since ${PARENT}" exit 1 fi

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 28 May '21

28 May '21

commit e1f0b9fb1eb6cf8e57655bb9db4224b5ce080d0f Merge: fd3678fa60 8b6e919086 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 28 08:03:43 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 scripts/git/git-resquash.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by nickm＠torproject.org 28 May '21

28 May '21

commit f8d028e14a301a77696144fd2bcab91becf51921 Merge: 6d11a0c61f 8b6e919086 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 28 08:03:43 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 scripts/git/git-resquash.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0