Commit 692005b3 authored by Nick Mathewson's avatar Nick Mathewson 👁
Browse files

Merge remote-tracking branch 'asn/bug6274_take3' into maint-0.2.3

parents 6cf8e38e a1d060a6
o Minor bugfixes:
- Ignore ServerTransportPlugin lines when Tor is not configured as
a relay. Fixes bug 6274; bugfix on
o Minor features:
- Terminate active server managed proxies if Tor stops being a
relay. Addresses parts of bug 6274; bugfix on
......@@ -1464,7 +1464,7 @@ options_act(const or_options_t *old_options)
if (options->ServerTransportPlugin) {
if (options->ServerTransportPlugin && server_mode(options)) {
for (cl = options->ServerTransportPlugin; cl; cl = cl->next) {
if (parse_server_transport_line(cl->value, 0)<0) {
......@@ -4019,6 +4019,13 @@ options_validate(or_options_t *old_options, or_options_t *options,
REJECT("Server transport line did not parse. See logs for details.");
if (options->ServerTransportPlugin && !server_mode(options)) {
log_notice(LD_GENERAL, "Tor is not configured as a relay but you specified"
" a ServerTransportPlugin line (%s). The ServerTransportPlugin "
"line will be ignored.",
if (options->ConstrainedSockets) {
/* If the user wants to constrain socket buffer use, make sure the desired
* limit is between MIN|MAX_TCPSOCK_BUFFER in k increments. */
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment