From 21da2d76895b245e71cc6ef78ee01c3a3c088dab Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 11 Sep 2019 00:00:10 +0200
Subject: [PATCH 1/2] gitlab-ci: purge old job for mirroring, its unused and
 obsolete

---
 .gitlab-ci.yml | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2d0d55dd4..402c7646c0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,33 +13,3 @@ build:
     - make check || (e=$?; cat test-suite.log; exit $e)
     - make install
 
-update:
-  only:
-    - schedules
-  script: 
-    - "apt-get install -y --fix-missing git openssh-client"
-    
-    # Run ssh-agent (inside the build environment)
-    - eval $(ssh-agent -s)
-
-    # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
-    - ssh-add <(echo "$DEPLOY_KEY")
-
-    # For Docker builds disable host key checking. Be aware that by adding that
-    # you are susceptible to man-in-the-middle attacks.
-    # WARNING: Use this only with the Docker executor, if you use it with shell
-    # you will overwrite your user's SSH config.
-    - mkdir -p ~/.ssh
-    - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
-    # In order to properly check the server's host key, assuming you created the
-    # SSH_SERVER_HOSTKEYS variable previously, uncomment the following two lines
-    # instead.
-    - mkdir -p ~/.ssh
-    - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEYS" > ~/.ssh/known_hosts'
-    - echo "merging from torgit"
-    - git config --global user.email "labadmin@oniongit.eu"
-    - git config --global user.name "gitadmin"
-    - "mkdir tor"
-    - "cd tor" 
-    - git clone --bare https://git.torproject.org/tor.git
-    - git push --mirror git@oniongit.eu:network/tor.git

From dfa1800c7f345a6b5886cc265a249a285f8f5512 Mon Sep 17 00:00:00 2001
From: Taylor Yu <catalyst@torproject.org>
Date: Mon, 10 Feb 2020 14:21:15 -0600
Subject: [PATCH 2/2] changes file for ticket 33213

---
 changes/ticket33213 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 changes/ticket33213

diff --git a/changes/ticket33213 b/changes/ticket33213
new file mode 100644
index 0000000000..f1da591bd1
--- /dev/null
+++ b/changes/ticket33213
@@ -0,0 +1,3 @@
+  o Minor bugfixes (continuous integration):
+    - Remove the buggy and unused mirroring job.  Fixes bug 33213;
+      bugfix on 0.3.2.2-alpha.