tor: Update description for bridge options

- Mention that this option is for preventing censorship.

- Simplify description of upstream bridges.

- Give hyperlink to bridges.torproject.org.

- Make it slightly more clear that users can copy paste information from
  bridges page.

- Update list of supported transports.
This commit is contained in:
Sunil Mohan Adapa 2017-01-29 10:50:00 +05:30
parent 4162c2df86
commit c311175797
No known key found for this signature in database
GPG Key ID: 36C361440C9BC971

View File

@ -84,19 +84,21 @@ class TorForm(forms.Form): # pylint: disable=W0232
use_upstream_bridges = forms.BooleanField(
label=_('Use upstream bridges to connect to Tor network'),
required=False,
help_text=_('When enabled, the bridges configured below will be used '
'to connect to the Tor network. This will disable relay '
'modes. Only use this option if you cannot connect to '
'the Tor network directly.'))
help_text=_(
'When enabled, the bridges configured below will be used to '
'connect to the Tor network. Use this option if your Internet '
'Service Provider (ISP) blocks or censors connections to the '
'Tor Network. This will disable relay modes.'))
upstream_bridges = TrimmedCharField(
widget=widgets.Textarea,
label=_('Upstream bridges'),
required=False,
help_text=_('If you need to use a bridge to connect to Tor network, '
'you can get some bridges from '
'https://bridges.torproject.org/ and paste the bridge '
'information here. Note: If you need to use a pluggable '
'transport, only obfs4 is supported currently.'),
help_text=_(
'You can get some bridges from <a '
'href="https://bridges.torproject.org/">'
'https://bridges.torproject.org/</a> and copy/paste the bridge '
'information here. Currently supported transports are none, '
'obfs3, obfs4 and scamblesuit.'),
validators=[bridges_validator])
relay_enabled = forms.BooleanField(
label=_('Enable Tor relay'),