merge of '8511dd159fa291cbf15fc0ea8bde4b331ed44534'

and 'd577249d0bf080d821db013df9a945dd87217a09'
2016-01-23 17:17:40 +00:00
parent ec27458393 d08f29d7d6
commit 594abdee55
3 changed files with 3105 additions and 1000 deletions
--- a/installer/resources/geoip.txt
+++ b/installer/resources/geoip.txt
--- a/installer/resources/geoipv6.dat.gz
+++ b/installer/resources/geoipv6.dat.gz
--- a/installer/resources/i2prouter
+++ b/installer/resources/i2prouter
@@ -556,7 +556,7 @@ setup_openbsd() {
    set +e
 }

-if [ "$DIST_OS"="openbsd" -a ! -f "$WRAPPER_CMD" ]; then
+if [ "$DIST_OS" = "openbsd" -a ! -f "$WRAPPER_CMD" ]; then
    # We handle it here because Tanuki doesn't ship OpenBSD binaries.
    # We don't either, but they are (finally!) in OpenBSD itself.
    setup_openbsd