[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit ba7e37e336e93ac98a09e28b89fc08aed0cbd411 Author: Translation commit bot Date: Sun Aug 12 05:45:10 2018 + Update translations for bridgedb --- tr/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index 0341671cf..072cfc7f2 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2018-06-22 05:22+\n" +"PO-Revision-Date: 2018-08-12 05:26+\n" "Last-Translator: Kaya Zeren \n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -264,7 +264,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Ek olarak BridgeDB %s hiçbir Takılabilir Aktarımı kullanmayan %s birçok eski, sıradan\nve özelliksiz köprüye sahiptir. KulaÄa iyi gelmeyebilir ancak bu köprüler hala pek çok\ndurumda Ä°nternet kısıtlamalarını aÅmaya yardım edebilirler.\n\n" +msgstr "Ayrıca BridgeDB %s üzerinde herhangi bir Takılabilir Aktarımı kullanmayan %s birçok eski, sıradan\nve özelliksiz vanilla köprüsü bulunur. KulaÄa pek iyi gelmeyebilir ancak bu köprüler hala pek çok\ndurumda Ä°nternet engellemelerini aÅmaya yardım edebilir.\n\n" #: bridgedb/strings.py:101 msgid "What are bridges?" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed
commit 92638a79b4019c3adc072d74d248b3f6a7305c36 Author: Translation commit bot Date: Sun Aug 12 05:45:16 2018 + Update translations for bridgedb_completed --- tr/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po index 0341671cf..072cfc7f2 100644 --- a/tr/LC_MESSAGES/bridgedb.po +++ b/tr/LC_MESSAGES/bridgedb.po @@ -27,7 +27,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n" "POT-Creation-Date: 2015-07-25 03:40+\n" -"PO-Revision-Date: 2018-06-22 05:22+\n" +"PO-Revision-Date: 2018-08-12 05:26+\n" "Last-Translator: Kaya Zeren \n" "Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n" "MIME-Version: 1.0\n" @@ -264,7 +264,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Ek olarak BridgeDB %s hiçbir Takılabilir Aktarımı kullanmayan %s birçok eski, sıradan\nve özelliksiz köprüye sahiptir. KulaÄa iyi gelmeyebilir ancak bu köprüler hala pek çok\ndurumda Ä°nternet kısıtlamalarını aÅmaya yardım edebilirler.\n\n" +msgstr "Ayrıca BridgeDB %s üzerinde herhangi bir Takılabilir Aktarımı kullanmayan %s birçok eski, sıradan\nve özelliksiz vanilla köprüsü bulunur. KulaÄa pek iyi gelmeyebilir ancak bu köprüler hala pek çok\ndurumda Ä°nternet engellemelerini aÅmaya yardım edebilir.\n\n" #: bridgedb/strings.py:101 msgid "What are bridges?" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [stem/master] Listener exceptions and malformed events broke event loop
commit ed6460df4a6fa8446a1e2923bddde652f5d91ed7
Author: Damian Johnson
Date: Fri Aug 10 03:30:47 2018 -0700
Listener exceptions and malformed events broke event loop
When a listener raised an uncaught exception or tor provides a malformed
event
we terminated our event loop, preventing any further events from being
handled.
I haven't seen this nail us in practice but definitely both oversights.
https://trac.torproject.org/projects/tor/ticket/27053
---
docs/change_log.rst | 2 ++
stem/control.py | 25 +
test/unit/control/controller.py | 18 +-
3 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/docs/change_log.rst b/docs/change_log.rst
index 362e4e10..75a25847 100644
--- a/docs/change_log.rst
+++ b/docs/change_log.rst
@@ -47,6 +47,8 @@ The following are only available within Stem's `git repository
* **Controller**
* Documented v3 hidden service support (:trac:`25124`, :spec:`6bd0a69`)
+ * Listener exceptions and malformed events no longer break further event
processing (:trac:`27053`)
+ * Added the stem.control.MALFORMED_EVENTS event listener constant
* Added support for limiting the maximum number of streams to
:func:`~stem.control.Controller.create_ephemeral_hidden_service`
(:spec:`2fcb1c2`)
* Added a timeout argument to :class:`~stem.control.Controller` methods that
could await a response (:trac:`26056`)
* Stacktrace if :func:`stem.connection.connect` had a string port argument
diff --git a/stem/control.py b/stem/control.py
index 7e1d1286..05cf44ce 100644
--- a/stem/control.py
+++ b/stem/control.py
@@ -286,6 +286,8 @@ from stem.util import log
EVENTS_LISTENING_TIMEOUT = 0.1
+MALFORMED_EVENTS = 'MALFORMED_EVENTS'
+
# state changes a control socket can have
State = stem.util.enum.Enum('INIT', 'RESET', 'CLOSED')
@@ -3057,6 +3059,13 @@ class Controller(BaseController):
If a new control connection is initialized then this listener will be
reattached.
+If tor emits a malformed event it can be received by listening for the
+stem.control.MALFORMED_EVENTS constant.
+
+.. versionchanged:: 1.7.0
+ Listener exceptions and malformed events no longer break further event
+ processing. Added the **MALFORMED_EVENTS** constant.
+
:param functor listener: function to be called when an event is received
:param stem.control.EventType events: event types to be listened for
@@ -3874,13 +3883,21 @@ class Controller(BaseController):
log.warn('We were unable assert ownership of tor through
TAKEOWNERSHIP, despite being configured to be the owning process through
__OwningControllerProcess. (%s)' % response)
def _handle_event(self, event_message):
-stem.response.convert('EVENT', event_message, arrived_at = time.time())
+try:
+ stem.response.convert('EVENT', event_message, arrived_at = time.time())
+ event_type = event_message.type
+except stem.ProtocolError as exc:
+ log.error('Tor sent a malformed event (%s): %s' % (exc, event_message))
+ event_type = MALFORMED_EVENTS
with self._event_listeners_lock:
- for event_type, event_listeners in list(self._event_listeners.items()):
-if event_type == event_message.type:
+ for listener_type, event_listeners in
list(self._event_listeners.items()):
+if listener_type == event_type:
for listener in event_listeners:
-listener(event_message)
+try:
+ listener(event_message)
+except Exception as exc:
+ log.warn('Event listener raised an uncaught exception (%s): %s'
% (exc, event_message))
def _attach_listeners(self):
"""
diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py
index fa934f34..c5809192 100644
--- a/test/unit/control/controller.py
+++ b/test/unit/control/controller.py
@@ -15,7 +15,7 @@ import stem.util.system
import stem.version
from stem import ControllerError, DescriptorUnavailable, InvalidArguments,
InvalidRequest, ProtocolError, UnsatisfiableRequest
-from stem.control import _parse_circ_path, Listener, Controller, EventType
+from stem.control import MALFORMED_EVENTS, _parse_circ_path, Listener,
Controller, EventType
from stem.response import ControlMessage
from stem.exit_policy import ExitPolicy
@@ -49,6 +49,9 @@ class TestControl(unittest.TestCase):
self.bw_listener = Mock()
self.controller.add_event_listener(self.bw_listener, EventType.BW)
+ self.malformed_listener = Mock()
+ self.controller.add_event_listener(self.malformed_listener,
MALFORMED_EVENTS)
+
def test_event_description(self):
self.assertEqual("Logging at the debug runlevel. This is low level, high
volume information about tor's internals that generally isn't useful to
users.", stem.control.event_description('DEBUG'))
self.assertEqual('Event emitted every second with the bytes sent and
[tor-commits] [torspec/master] Merge remote-tracking branch 'teor/ticket26827'
commit 2d33e5f2e95f068d783673865c08cf6d33c36614 Merge: 1dbb6d6 b155c2e Author: Nick Mathewson Date: Sat Aug 11 10:20:24 2018 -0400 Merge remote-tracking branch 'teor/ticket26827' dir-spec.txt | 4 1 file changed, 4 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] dir-spec: Authorities should only read V3BandwidthsFile once per vote
commit b155c2e13d96c204121503df9e5aa22d30f3f9da Author: teor Date: Wed Jul 18 11:15:42 2018 +1000 dir-spec: Authorities should only read V3BandwidthsFile once per vote Closes 26827. --- dir-spec.txt | 4 1 file changed, 4 insertions(+) diff --git a/dir-spec.txt b/dir-spec.txt index 7da4c9a..8da28c4 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2631,6 +2631,10 @@ http:///tor/status-vote/next/authority.z + To avoid inconsistent reads, authorities SHOULD only read the bandwidth + file once per voting period. Further processing and serving SHOULD use a + cached copy. + The bandwidth list format is described in bandwidth-file-spec.txt. The standard URLs for bandwidth list files first-appeared in Tor 0.3.5. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/206'
commit 57d0b8c3cd7213f03b0a37c8c74c003b1c820438 Merge: c775689e9 5028a52b5 Author: Nick Mathewson Date: Sat Aug 11 10:14:29 2018 -0400 Merge remote-tracking branch 'tor-github/pr/206' INSTALL | 34 -- changes/doc26588 | 3 +++ 2 files changed, 3 insertions(+), 34 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Remove old instructions from INSTALL
commit 5028a52b54a7123e9dccc3271c8801c7dbde05d6 Author: rl1987 Date: Tue Jul 3 16:33:07 2018 +0300 Remove old instructions from INSTALL --- INSTALL | 34 -- changes/doc26588 | 3 +++ 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/INSTALL b/INSTALL index ddb790b0b..f493f4ed3 100644 --- a/INSTALL +++ b/INSTALL @@ -16,37 +16,3 @@ If it doesn't build for you: ./configure --with-libevent-dir=/usr/local rather than simply ./configure. - If you have mysterious autoconf failures while linking openssl, - consider setting your LD_LIBRARY_PATH to the openssl lib directory. - For example, "setenv LD_LIBRARY_PATH /usr/athena/lib". - - Lastly, check out - https://www.torproject.org/docs/faq#DoesntWork - -How to do static builds of tor: - -Tor supports linking each of the libraries it needs statically. Use the ---enable-static-X ./configure option in conjunction with the --with-X-dir -option for libevent, zlib, and openssl. For this to work sanely, libevent -should be built with --disable-shared --enable-static --with-pic, and -OpenSSL should be built with no-shared no-dso. - -If you need to build tor so that system libraries are also statically linked, -use the --enable-static-tor ./configure option. This won't work on OS X -unless you build the required crt0.o yourself. It is also incompatible with -the --enable-gcc-hardening option. - -An example of how to build a mostly static tor: -./configure --enable-static-libevent \ ---enable-static-openssl \ ---enable-static-zlib \ ---with-libevent-dir=/tmp/static-tor/libevent-1.4.14b-stable \ ---with-openssl-dir=/tmp/static-tor/openssl-0.9.8r/ \ ---with-zlib-dir=/tmp/static-tor/zlib-1.2.5 - -An example of how to build an entirely static tor: -./configure --enable-static-tor \ ---with-libevent-dir=/tmp/static-tor/libevent-1.4.14b-stable \ ---with-openssl-dir=/tmp/static-tor/openssl-0.9.8r/ \ ---with-zlib-dir=/tmp/static-tor/zlib-1.2.5 - diff --git a/changes/doc26588 b/changes/doc26588 new file mode 100644 index 0..4b67bdb03 --- /dev/null +++ b/changes/doc26588 @@ -0,0 +1,3 @@ + o Documentation: +- Remove old instructions from INSTALL document. Closes + ticket 26588. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add changes file
commit dddc9a1715a2101690adb4026be81c2cc1aad671 Author: rl1987 Date: Fri Jul 20 21:42:45 2018 +0300 Add changes file --- changes/bug26882 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/bug26882 b/changes/bug26882 new file mode 100644 index 0..adfe0e2f3 --- /dev/null +++ b/changes/bug26882 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging, documentation): +- When SafeLogging is enabled, scrub IP address in + channel_tls_process_netinfo_cell(). Also, add a note + to manpage that scrubbing is not guaranteed on loglevels + below Notice. Fixes bug 26882; bugfix on 0.2.4.10-alpha. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Scrub IP in channel_tls_process_netinfo_cell() if SafeLogging is on
commit 9c34f95b89e8c1c86c8564a40fcd1090180dd686 Author: rl1987 Date: Fri Jul 20 21:13:38 2018 +0300 Scrub IP in channel_tls_process_netinfo_cell() if SafeLogging is on --- src/core/or/channeltls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/or/channeltls.c b/src/core/or/channeltls.c index 87f5a02b7..96898993c 100644 --- a/src/core/or/channeltls.c +++ b/src/core/or/channeltls.c @@ -1837,7 +1837,8 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan) (int)(chan->conn->link_proto), hex_str(identity_digest, DIGEST_LEN), tor_addr_is_null(_apparent_addr) ? - "" : fmt_and_decorate_addr(_apparent_addr)); + "" : + safe_str_client(fmt_and_decorate_addr(_apparent_addr))); } assert_connection_ok(TO_CONN(chan->conn),time(NULL)); } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add a sentence to manpage that we may not scrub logs at loglevels below Notice
commit a17e9d33781ae56107cfe4b1ece17c1273f8acec Author: rl1987 Date: Fri Jul 20 21:35:13 2018 +0300 Add a sentence to manpage that we may not scrub logs at loglevels below Notice --- doc/tor.1.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 1db8cabf8..0c010d94f 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -754,7 +754,9 @@ GENERAL OPTIONS If this option is set to 0, Tor will not perform any scrubbing, if it is set to 1, all potentially sensitive strings are replaced. If it is set to relay, all log messages generated when acting as a relay are sanitized, but -all messages generated when acting as a client are not. (Default: 1) +all messages generated when acting as a client are not. +Note: Tor may not heed this option when logging at log levels below Notice. +(Default: 1) [[User]] **User** __Username__:: On startup, setuid to this user and setgid to their primary group. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/244'
commit c775689e96be101d2818722aa92393190ca3fc6d Merge: 61d5bcc1a dddc9a171 Author: Nick Mathewson Date: Sat Aug 11 10:05:15 2018 -0400 Merge remote-tracking branch 'tor-github/pr/244' changes/bug26882 | 5 + doc/tor.1.txt| 4 +++- src/core/or/channeltls.c | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Print stacktrace when crypto_pk_get_digest() fails in router_build_fresh_descriptor()
commit 7a1007861f978abe0703a8fe062ed3c983bccd49
Author: rl1987
Date: Wed Aug 8 18:56:27 2018 +0300
Print stacktrace when crypto_pk_get_digest() fails in
router_build_fresh_descriptor()
---
src/feature/relay/router.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index 40839f260..e4ec01af2 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -2350,8 +2350,8 @@ router_build_fresh_descriptor(routerinfo_t **r,
extrainfo_t **e)
}
ri->identity_pkey = crypto_pk_dup_key(get_server_identity_key());
- if (crypto_pk_get_digest(ri->identity_pkey,
- ri->cache_info.identity_digest)<0) {
+ if (BUG(crypto_pk_get_digest(ri->identity_pkey,
+ ri->cache_info.identity_digest) < 0)) {
routerinfo_free(ri);
return TOR_ROUTERINFO_ERROR_DIGEST_FAILED;
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/268'
commit 61d5bcc1a251002d726e66461ec576d9b71cebd1 Merge: b7ed61167 5f2e00241 Author: Nick Mathewson Date: Sat Aug 11 10:04:04 2018 -0400 Merge remote-tracking branch 'tor-github/pr/268' changes/bug27034 | 6 ++ src/feature/relay/router.c | 26 -- src/test/test_policy.c | 2 +- 3 files changed, 15 insertions(+), 19 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Consider all routerinfo errors other than "not a server" transient
commit 9c242e950b45ac67b2b741bc4e0c920a9a57cb43
Author: rl1987
Date: Wed Aug 8 18:47:43 2018 +0300
Consider all routerinfo errors other than "not a server" transient
---
src/feature/relay/router.c | 22 ++
src/test/test_policy.c | 2 +-
2 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index 0cc488723..40839f260 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -164,22 +164,12 @@ routerinfo_err_to_string(int err)
int
routerinfo_err_is_transient(int err)
{
- switch (err) {
-case TOR_ROUTERINFO_ERROR_NO_EXT_ADDR:
- return 1;
-case TOR_ROUTERINFO_ERROR_CANNOT_PARSE:
- return 1;
-case TOR_ROUTERINFO_ERROR_NOT_A_SERVER:
- return 0;
-case TOR_ROUTERINFO_ERROR_DIGEST_FAILED:
- return 0; // XXX: bug?
-case TOR_ROUTERINFO_ERROR_CANNOT_GENERATE:
- return 1;
-case TOR_ROUTERINFO_ERROR_DESC_REBUILDING:
- return 1;
- }
-
- return 0;
+ /**
+ * For simplicity, we consider all errors other than
+ * "not a server" transient - see discussion on
+ * https://trac.torproject.org/projects/tor/ticket/27034
+ */
+ return err != TOR_ROUTERINFO_ERROR_NOT_A_SERVER;
}
/** Replace the current onion key with k. Does not affect
diff --git a/src/test/test_policy.c b/src/test/test_policy.c
index 4b1adc91f..6a07e5b1f 100644
--- a/src/test/test_policy.c
+++ b/src/test/test_policy.c
@@ -1706,7 +1706,7 @@ test_policies_getinfo_helper_policies(void *arg)
rv = getinfo_helper_policies(NULL, "exit-policy/full", ,
);
- tt_int_op(rv, OP_EQ, 0);
+ tt_int_op(rv, OP_EQ, -1);
tt_ptr_op(answer, OP_EQ, NULL);
tt_ptr_op(errmsg, OP_NE, NULL);
tt_str_op(errmsg, OP_EQ, "Key digest failed");
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add changes file
commit 5f2e00241a35f7658bde4f9afb0a758588217e40 Author: rl1987 Date: Wed Aug 8 19:07:50 2018 +0300 Add changes file --- changes/bug27034 | 6 ++ 1 file changed, 6 insertions(+) diff --git a/changes/bug27034 b/changes/bug27034 new file mode 100644 index 0..bdb7d29c1 --- /dev/null +++ b/changes/bug27034 @@ -0,0 +1,6 @@ + o Minor bugfixes (controller): +- Consider all routerinfo errors other than "not a server" + to be transient for the purpose of "GETINFO exit-policy/*" + controller request. Print stacktrace in the unlikely case + of failing to recompute routerinfo digest. Fixes bug 27034; + bugfix on 0.3.4.1-alpha. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-github/pr/32'
commit 1dbb6d6fbbae3dd939f54166971282fa7d6063b3 Merge: 3379222 b12d0a0 Author: Nick Mathewson Date: Sat Aug 11 10:02:36 2018 -0400 Merge remote-tracking branch 'tor-github/pr/32' control-spec.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] Simplify explanation of GETINFO exit-policy/*
commit b12d0a01ad3ad882b6dda7bbf8fc44205886f966 Author: rl1987 Date: Sun Aug 5 18:19:48 2018 +0300 Simplify explanation of GETINFO exit-policy/* Do not mention "non-transient internal error" as it is extremely unlikely to happen. --- control-spec.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index e7a5b79..5bca036 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -564,8 +564,7 @@ ExitPolicyRejectLocalInterfaces. These lines are based on the public addresses configured in the torrc and present on the relay's interfaces. Will send 552 error if the server is not running as - onion router or if there's non-transient internal error. Will send - 551 on transient internal error. + onion router. Will send 551 on internal error which may be transient. "exit-policy/ipv4" "exit-policy/ipv6" ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [webwml/master] Fix typo in bridges docs
commit 848d5f2c5df2aabc4fb3e1eda41a6fe2d78dc441 Author: hiro Date: Sat Aug 11 09:59:40 2018 +0200 Fix typo in bridges docs --- docs/en/bridges.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/bridges.wml b/docs/en/bridges.wml index 4eff6f45..33c0ad6c 100644 --- a/docs/en/bridges.wml +++ b/docs/en/bridges.wml @@ -96,7 +96,7 @@ Sadly, pluggable transports are not immune to detection, if a censor is given enough time. In the past, we promoted obfs and obfs2 as safe -transports. These are now deprecated and were replaced by obfs4, +transports. These are now deprecated and were replaced by obfs3, scramblesuit, fte, and obfs4. Bridges which support pluggable transports can be used with Tor Browser ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
