diff --git a/src/freedombone b/src/freedombone
index 229a7016..7b216f95 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -185,6 +185,7 @@ GNUSOCIAL_COMMIT='5b847eff120264c3e9571e8a939e6b3a30e68032'
 # Domain name for hubzilla installation
 HUBZILLA_DOMAIN_NAME=
 HUBZILLA_CODE=
+HUBZILLA_ONION_PORT=8085
 HUBZILLA_REPO="https://github.com/redmatrix/hubzilla.git"
 HUBZILLA_ADDONS_REPO="https://github.com/redmatrix/hubzilla-addons.git"
 HUBZILLA_ADMIN_PASSWORD=
@@ -3178,6 +3179,13 @@ function initial_setup {
   echo 'initial_setup' >> $COMPLETION_FILE
 }
 
+function install_tor {
+  if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
+      return
+  fi
+  apt-get install tor
+}
+
 function install_editor {
   if grep -Fxq "install_editor" $COMPLETION_FILE; then
       return
@@ -7512,7 +7520,6 @@ function install_hubzilla {
       echo 'Hubzilla' >> /home/$MY_USERNAME/README
       echo '==========' >> /home/$MY_USERNAME/README
       echo $"Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
-      echo '' >> /home/$MY_USERNAME/README
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
       chmod 600 /home/$MY_USERNAME/README
   fi
@@ -7631,6 +7638,82 @@ quit" > $INSTALL_DIR/batch.sql
   echo '      deny  all;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
   echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
   echo '}' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo 'server {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo "    listen 127.0.0.1:${HUBZILLA_ONION_PORT} default_server;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo "    root /var/www/$HUBZILLA_DOMAIN_NAME/htdocs;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo "    server_name $HUBZILLA_DOMAIN_NAME;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo "    error_log /var/log/nginx/${HUBZILLA_DOMAIN_NAME}_error_ssl.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    index index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    charset utf-8;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    client_max_body_size 20m;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    client_body_buffer_size 128k;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    access_log off;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    limit_conn conn_limit_per_ip 10;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    limit_req zone=req_limit_per_ip burst=10 nodelay;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    add_header X-Frame-Options DENY;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    add_header X-Content-Type-Options nosniff;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    add_header Strict-Transport-Security max-age=15768000;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    # rewrite to front controller as default rule' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    location / {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo "    # make sure webfinger and other well known services aren't blocked" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    # by denying dot files and rewrite request to the front controller' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    location ^~ /.well-known/ {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        allow all;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    # statically serve these file types when possible' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    # otherwise fall back to front controller' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    # allow browser to cache them' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    # added .htm for advanced source code editor library' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|ttf|woff|svg)$ {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        expires 30d;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        try_files $uri /index.php?q=$uri&$args;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    # block these file types' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    location ~* \.(tpl|md|tgz|log|out)$ {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        deny all;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    # or a unix socket' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    location ~* \.php$ {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        # Zero-day exploit defense.' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        # http://forum.nginx.org/read.php?2,88845,page=3' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo "        # Won't work properly (404 error) if the file is not stored on this" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo "        # server, which is entirely possible with php-fpm/php-fcgi." >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo "        # Comment the 'try_files' line out if you set up php-fpm/php-fcgi on" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo "        # another machine. And then cross your fingers that you won't get hacked." >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        try_files $uri $uri/ /index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        fastcgi_split_path_info ^(.+\.php)(/.+)$;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        # With php5-cgi alone:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        # fastcgi_pass 127.0.0.1:9000;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        # With php5-fpm:' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        fastcgi_pass unix:/var/run/php5-fpm.sock;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        include fastcgi_params;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        fastcgi_index index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        fastcgi_read_timeout 300;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    # deny access to all dot files' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    location ~ /\. {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '        deny all;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    location ~ /\.ht {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '      deny  all;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
+  echo '}' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
 
   configure_php
 
@@ -7713,31 +7796,37 @@ quit" > $INSTALL_DIR/batch.sql
   chown -R www-data:www-data /var/www/$HUBZILLA_DOMAIN_NAME/htdocs
 
   nginx_ensite $HUBZILLA_DOMAIN_NAME
+
+  if [ ! -d /var/lib/tor ]; then
+      echo $'No Tor installation found. Hubzilla onion site cannot be configured.'
+      exit 45925
+  fi
+  if ! grep -q "hidden_service_hubzilla" /etc/tor/torrc; then
+      echo 'HiddenServiceDir /var/lib/tor/hidden_service_hubzilla/' >> /etc/tor/torrc
+      echo "HiddenServicePort 80 127.0.0.1:${HUBZILLA_ONION_PORT}" >> /etc/tor/torrc
+      echo $'Added onion site for Hubzilla'
+  fi
+
   service php5-fpm restart
   service nginx restart
   service cron restart
+  systemctl restart tor
 
-  # some post-install instructions for the user
-  if ! grep -q $"To set up your Hubzilla site go to" /home/$MY_USERNAME/README; then
-      echo '' >> /home/$MY_USERNAME/README
-      echo $"To set up your Hubzilla site go to" >> /home/$MY_USERNAME/README
-      echo "https://$HUBZILLA_DOMAIN_NAME" >> /home/$MY_USERNAME/README
-      echo $'You will need to have a non self-signed SSL certificate in order' >> /home/$MY_USERNAME/README
-      echo $"to use Hubzilla. Put the public certificate in /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt" >> /home/$MY_USERNAME/README
-      echo $"and the private certificate in /etc/ssl/private/$HUBZILLA_DOMAIN_NAME.key." >> /home/$MY_USERNAME/README
-      echo $'If there is an intermediate certificate needed (such as with StartSSL) then' >> /home/$MY_USERNAME/README
-      echo $'this will need to be concatenated onto the end of the crt file, like this:' >> /home/$MY_USERNAME/README
-      echo '' >> /home/$MY_USERNAME/README
-      echo "  cat /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.crt /etc/ssl/chains/startssl-sub.class1.server.ca.pem > /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt" >> /home/$MY_USERNAME/README
-      echo '' >> /home/$MY_USERNAME/README
-      echo $"Then change ssl_certificate to /etc/ssl/certs/$HUBZILLA_DOMAIN_NAME.bundle.crt" >> /home/$MY_USERNAME/README
-      echo $"within /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME" >> /home/$MY_USERNAME/README
+  if [ ! -f /var/lib/tor/hidden_service_hubzilla/hostname ]; then
+      echo $'Hubzilla onion site hostname not found'
+      exit 12052
+  fi
+  HUBZILLA_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_hubzilla/hostname)
+
+  if ! grep -q "Hubzilla onion domain" /home/$MY_USERNAME/README; then
+      echo "Hubzilla onion domain: ${HUBZILLA_ONION_HOSTNAME}" >> /home/$MY_USERNAME/README
       echo '' >> /home/$MY_USERNAME/README
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
       chmod 600 /home/$MY_USERNAME/README
   fi
 
-  echo "Hubzilla domain:$HUBZILLA_DOMAIN_NAME" >> $COMPLETION_FILE
+  echo "Hubzilla domain:${HUBZILLA_DOMAIN_NAME}" >> $COMPLETION_FILE
+  echo "Hubzilla onion domain:${HUBZILLA_ONION_HOSTNAME}" >> $COMPLETION_FILE
   echo 'install_hubzilla' >> $COMPLETION_FILE
 }
 
@@ -8710,6 +8799,7 @@ change_debian_repos
 enable_backports
 configure_dns
 initial_setup
+install_tor
 check_date
 install_dynamicdns
 randomize_cron