nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.2'

Browse Source
This commit is contained in:
Roger Dingledine 2010-09-27 18:33:12 -04:00
commit f006f02ca4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/spec/dir-spec.txt
View File

@ -1177,6 +1177,12 @@
0.2.2.14-alpha looked for bwconnrate and bwconnburst, but then 0.2.2.14-alpha looked for bwconnrate and bwconnburst, but then
did the wrong thing with them; see bug 1830 for details.) did the wrong thing with them; see bug 1830 for details.)
"refuseunknownexits" -- if set and non-zero, exit relays look at
the previous hop of circuits that ask to open an exit stream,
and refuse to exit if they don't recognize it as a relay. The
goal is to make it harder for people to use them as one-hop
proxies. See trac entry 1751 for details.
See also "2.4.5. Consensus parameters governing behavior" See also "2.4.5. Consensus parameters governing behavior"
in path-spec.txt for a series of circuit build time related in path-spec.txt for a series of circuit build time related
consensus params. consensus params.

3
src/or/connection_edge.c
View File

@ -2555,8 +2555,7 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ)
* has explicitly allowed that in the config. It attracts attackers * has explicitly allowed that in the config. It attracts attackers
* and users who'd be better off with, well, single-hop proxies. * and users who'd be better off with, well, single-hop proxies.
*/ */
// log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
log_notice(LD_PROTOCOL,
"Attempt by %s to open a stream %s. Closing.", "Attempt by %s to open a stream %s. Closing.",
safe_str(or_circ->p_conn->_base.address), safe_str(or_circ->p_conn->_base.address),
or_circ->is_first_hop ? "on first hop of circuit" : or_circ->is_first_hop ? "on first hop of circuit" :