commit 2351f8652bb99b908c36957edee1585319ff6fcb Author: Philipp Winter phw@nymity.ch Date: Thu Jul 2 10:53:28 2020 -0700

Remove the --reload command line switch.

This fixes tpo/anti-censorship/bridgedb#40001. --- CHANGELOG | 3 +++ README.rst | 4 ---- bridgedb/parse/options.py | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG index c712436..0351de7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ + * FIXES https://gitlab.torproject.org/tpo/anti-censorship/bridgedb/-/issues/40001 + Remove the --reload command line switch. It doesn't actually do anything. + * FIXES https://bugs.torproject.org/29184 Add a new configuration option, BLACKLISTED_TOR_VERSIONS, which contains a list of Tor versions. BridgeDB won't hand out bridges whose Tor version diff --git a/README.rst b/README.rst index 1b0a840..51eff40 100644 --- a/README.rst +++ b/README.rst @@ -318,10 +318,6 @@ Reloading Bridges From Their Descriptor Files: When you have new lists of bridges from the Bridge Authority, replace the old files and do::

- bridgedb --reload - -Or just give it a SIGHUP:: - kill -s SIGHUP `cat .../run/bridgedb.pid`

diff --git a/bridgedb/parse/options.py b/bridgedb/parse/options.py index c32ada3..83c0984 100644 --- a/bridgedb/parse/options.py +++ b/bridgedb/parse/options.py @@ -290,8 +290,6 @@ class SIGUSR1Options(BaseOptions): class MainOptions(BaseOptions): """Main commandline options parser for BridgeDB."""

- optFlags = [ - ['reload', 'R', 'Reload bridge descriptors into running servers']] subCommands = [ ['mock', None, MockOptions, "Generate a testing environment"], ['SIGHUP', None, SIGHUPOptions,