[tor-commits] [tor/master] scripts: Merge forward test branch _042 into test branch _master

[teor at torproject.org]

commit 028987a0a1e841d7faf3ac131b0bd2795a963aa5
Author: teor <teor at torproject.org>
Date:   Tue Oct 15 13:36:56 2019 +1000

    scripts: Merge forward test branch _042 into test branch _master
    
    Fixes an issue where test branch _041 was merged into _042 and _master.
    This issue only affects test branch mode (-t).
---
 scripts/git/git-merge-forward.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh
index d16519b3f..59adbab82 100755
--- a/scripts/git/git-merge-forward.sh
+++ b/scripts/git/git-merge-forward.sh
@@ -101,7 +101,7 @@ MAINT_041=( "maint-0.4.1" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" \
 MAINT_042=( "maint-0.4.2" "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" \
     "_042" "_041")
 MAINT_MASTER=( "master" "maint-0.4.2" "$GIT_PATH/$TOR_MASTER_NAME" \
-    "_master" "_041")
+    "_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" )