Unverified Commit 40190f10 authored by Isis Lovecruft's avatar Isis Lovecruft
Browse files

Merge branch 'fix/19691' into develop

parents 98112574 081cdca7

README.rst

+3 −0
Original line number Diff line number Diff line
@@ -88,6 +88,9 @@ BridgeDB requires the following OS-level dependencies: 
-  geoip-database

-  `python-setuptools <https://pypi.python.org/pypi/setuptools>`__

-  libjpeg-dev

-  `flog <https://packages.debian.org/jessie/flog>`__ (only required if bridgedb

   is invocated with the ``run-bridgedb`` `script

   <https://gitweb.torproject.org/project/bridges/bridgedb-admin.git/tree/bin/run-bridgedb>`__)



As well as any Python dependencies in the ``requirements.txt`` file.

scripts/install-dependencies

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ if [ "$EUID" != "0" ] ; then SUDO=$(which sudo); fi 
if [ "$TRAVIS" == "true" ] ; then

    DEPENDS="${DEPENDS} realpath"

else

    DEPENDS="${DEPENDS} python-pip"

    DEPENDS="${DEPENDS} python-pip flog"

fi

    

MISSING=""