[tor-commits] [collector/release] Update create-tarballs.sh script and PROTOCOL.

[karsten at torproject.org]

commit d3203ceb9e726d641ea1a2621ff325873b7d6d45
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Thu Sep 19 12:37:18 2019 +0200

    Update create-tarballs.sh script and PROTOCOL.
    
    These changes still belong to archiving bridge pool assignments. But
    they're not important enough for putting out a new release at this
    point.
---
 CHANGELOG.md                          | 7 +++++++
 src/main/resources/create-tarballs.sh | 7 +++++++
 src/main/resources/docs/PROTOCOL      | 5 +----
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5f9488..d6992c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# Changes in version 1.??.? - 2019-??-??
+
+ * Minor changes
+   - Update create-tarballs.sh to also produce bridge pool assignments
+     tarballs.
+
+
 # Changes in version 1.11.0 - 2019-09-19
 
  * Medium changes
diff --git a/src/main/resources/create-tarballs.sh b/src/main/resources/create-tarballs.sh
index 50b7fdb..5802020 100755
--- a/src/main/resources/create-tarballs.sh
+++ b/src/main/resources/create-tarballs.sh
@@ -61,6 +61,8 @@ TARBALLS=(
   bridge-extra-infos-$YEARTWO-$MONTHTWO
   snowflakes-$YEARONE-$MONTHONE
   snowflakes-$YEARTWO-$MONTHTWO
+  bridge-pool-assignments-$YEARONE-$MONTHONE
+  bridge-pool-assignments-$YEARTWO-$MONTHTWO
 )
 TARBALLS=($(printf "%s\n" "${TARBALLS[@]}" | uniq))
 
@@ -90,6 +92,8 @@ DIRECTORIES=(
   $OUTDIR/bridge-descriptors/$YEARTWO/$MONTHTWO/extra-infos/
   $OUTDIR/snowflakes/$YEARONE/$MONTHONE/
   $OUTDIR/snowflakes/$YEARTWO/$MONTHTWO/
+  $OUTDIR/bridge-pool-assignments/$YEARONE/$MONTHONE/
+  $OUTDIR/bridge-pool-assignments/$YEARTWO/$MONTHTWO/
 )
 DIRECTORIES=($(printf "%s\n" "${DIRECTORIES[@]}" | uniq))
 
@@ -176,4 +180,7 @@ ln -f -s -t $ARCHIVEDIR/webstats/ $TARBALLTARGETDIR/webstats-20??-??.tar
 mkdir -p $ARCHIVEDIR/snowflakes/
 ln -f -s -t $ARCHIVEDIR/snowflakes/ $TARBALLTARGETDIR/snowflakes-20??-??.tar.xz
 
+mkdir -p $ARCHIVEDIR/bridge-pool-assignments/
+ln -f -s -t $ARCHIVEDIR/bridge-pool-assignments/ $TARBALLTARGETDIR/bridge-pool-assignments-20??-??.tar.xz
+
 echo `date` "Finished."
diff --git a/src/main/resources/docs/PROTOCOL b/src/main/resources/docs/PROTOCOL
index 478f168..d735d40 100644
--- a/src/main/resources/docs/PROTOCOL
+++ b/src/main/resources/docs/PROTOCOL
@@ -282,15 +282,12 @@
    The top level of subdirectories is
 
    * bridge-descriptors
+   * bridge-pool-assignments
    * exit-lists
    * relay-descriptors
    * torperf
    * snowflakes
 
-   (There has been another subdirectory 'bridge-pool-assignments' which has been
-   removed when CollecTor stopped collecting those descriptors.  However, it's
-   structure can still be found in the tarballs.)
-
 5.1 'exit-lists' and 'torperf' Tars
 
 5.1.1