Merge 89dd20a into merged_master (Elements PR #648)

Author: apoelstra

contrib/gitian-descriptors/gitian-liquid-win.yml

@@ -167,7 +167,8 @@ script: |
     make deploy
     make install DESTDIR=${INSTALLPATH}
     rename 's/-setup\.exe$/-setup-unsigned.exe/' *-setup.exe
-    cp -f elements-*setup*.exe $OUTDIR/
+    rename 's/elements-/liquid-/s' *-setup-unsigned.exe
+    cp -f liquid-*setup*.exe $OUTDIR/
     cd installed
 
     mv ${DISTNAME}/bin/elements-qt.exe ${DISTNAME}/bin/liquid-qt.exe
@@ -184,9 +185,8 @@ script: |
   cp -rf contrib/windeploy $BUILD_DIR
   cd $BUILD_DIR/windeploy
   mkdir unsigned
-  cp $OUTDIR/elements-*setup-unsigned.exe unsigned/
+  cp $OUTDIR/liquid-*setup-unsigned.exe unsigned/
   cd unsigned
-  rename 's/elements-/liquid-/s' *-setup-unsigned.exe
   cd ..
   find . | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ${OUTDIR}/${DISTNAME}-win-unsigned.tar.gz
   mv ${OUTDIR}/${DISTNAME}-x86_64-*-debug.zip ${OUTDIR}/${DISTNAME}-win64-debug.zip