Merge branch 'master' of git.openprivacy.ca:cwtch.im/cwtch

Dockerfile

@@ -29,8 +29,8 @@ RUN apk --no-cache add --update \
         zstd \
         zstd-dev \
       && wget -q https://www.torproject.org/dist/tor-0.3.5.3-alpha.tar.gz \
-      && tar xf tor-0.3.5.2-alpha.tar.gz \
-      && cd tor-0.3.5.2-alpha \
+      && tar xf tor-0.3.5.3-alpha.tar.gz \
+      && cd tor-0.3.5.3-alpha \
       && ./configure \
       && make install \
       && ls -R /usr/local/

server/docker/docker-entrypoint

@@ -26,7 +26,7 @@ tor -f /etc/tor/torrc
 sleep 15
 
 if [ -z "${CWTCH_CONFIG_DIR}" ]; then
-	CWTCH_CONFIG_DIR=/etc/CWTCH/
+	CWTCH_CONFIG_DIR=/etc/cwtch/
 fi
 
 #Run cwtch (or whatever the user passed)