From 87dee5c6517e23dc9358db0aeb994913ca156672 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 29 Sep 2015 10:20:31 +0200 Subject: [PATCH 1/2] Socks->SOCKS in torrcs. Fixes 15609 --- changes/bug15609 | 2 ++ src/config/torrc.minimal.in-staging | 20 ++++++++++---------- src/config/torrc.sample.in | 20 ++++++++++---------- 3 files changed, 22 insertions(+), 20 deletions(-) create mode 100644 changes/bug15609 diff --git a/changes/bug15609 b/changes/bug15609 new file mode 100644 index 0000000000..efaccdeaae --- /dev/null +++ b/changes/bug15609 @@ -0,0 +1,2 @@ + o Documentation: + - Fix capitalization of SOCKS in sample torrc. Closes ticket 15609. diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index ff324a96da..248cb5cf02 100644 --- a/src/config/torrc.minimal.in-staging +++ b/src/config/torrc.minimal.in-staging @@ -12,20 +12,20 @@ ## Tor will look for this file in various places based on your platform: ## https://www.torproject.org/docs/faq#torrc -## Tor opens a socks proxy on port 9050 by default -- even if you don't -## configure one below. Set "SocksPort 0" if you plan to run Tor only +## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't +## configure one below. Set "SOCKSPort 0" if you plan to run Tor only ## as a relay, and not make any local application connections yourself. -#SocksPort 9050 # Default: Bind to localhost:9050 for local connections. -#SocksPort 192.168.0.1:9100 # Bind to this address:port too. +#SOCKSPort 9050 # Default: Bind to localhost:9050 for local connections. +#SOCKSPort 192.168.0.1:9100 # Bind to this address:port too. ## Entry policies to allow/deny SOCKS requests based on IP address. -## First entry that matches wins. If no SocksPolicy is set, we accept -## all (and only) requests that reach a SocksPort. Untrusted users who -## can access your SocksPort may be able to learn about the connections +## First entry that matches wins. If no SOCKSPolicy is set, we accept +## all (and only) requests that reach a SOCKSPort. Untrusted users who +## can access your SOCKSPort may be able to learn about the connections ## you make. -#SocksPolicy accept 192.168.0.0/16 -#SocksPolicy accept6 FC00::/7 -#SocksPolicy reject * +#SOCKSPolicy accept 192.168.0.0/16 +#SOCKSPolicy accept6 FC00::/7 +#SOCKSPolicy reject * ## Logs go to stdout at level "notice" unless redirected by something ## else, like one of the below lines. You can have as many Log lines as diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index ff324a96da..248cb5cf02 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -12,20 +12,20 @@ ## Tor will look for this file in various places based on your platform: ## https://www.torproject.org/docs/faq#torrc -## Tor opens a socks proxy on port 9050 by default -- even if you don't -## configure one below. Set "SocksPort 0" if you plan to run Tor only +## Tor opens a SOCKS proxy on port 9050 by default -- even if you don't +## configure one below. Set "SOCKSPort 0" if you plan to run Tor only ## as a relay, and not make any local application connections yourself. -#SocksPort 9050 # Default: Bind to localhost:9050 for local connections. -#SocksPort 192.168.0.1:9100 # Bind to this address:port too. +#SOCKSPort 9050 # Default: Bind to localhost:9050 for local connections. +#SOCKSPort 192.168.0.1:9100 # Bind to this address:port too. ## Entry policies to allow/deny SOCKS requests based on IP address. -## First entry that matches wins. If no SocksPolicy is set, we accept -## all (and only) requests that reach a SocksPort. Untrusted users who -## can access your SocksPort may be able to learn about the connections +## First entry that matches wins. If no SOCKSPolicy is set, we accept +## all (and only) requests that reach a SOCKSPort. Untrusted users who +## can access your SOCKSPort may be able to learn about the connections ## you make. -#SocksPolicy accept 192.168.0.0/16 -#SocksPolicy accept6 FC00::/7 -#SocksPolicy reject * +#SOCKSPolicy accept 192.168.0.0/16 +#SOCKSPolicy accept6 FC00::/7 +#SOCKSPolicy reject * ## Logs go to stdout at level "notice" unless redirected by something ## else, like one of the below lines. You can have as many Log lines as From c1981955ffe1d504b920ad1a1d10b83057d35660 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 29 Sep 2015 10:21:52 +0200 Subject: [PATCH 2/2] go back in time to fix a changelog entry. Fix for 17165 --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 25c7442c88..0191717334 100644 --- a/ChangeLog +++ b/ChangeLog @@ -61,7 +61,7 @@ Changes in version 0.2.7.3-rc - 2015-09-25 Fixes bug 16685; bugfix on 0.2.7.2-alpha. Reported by "s7r". o Minor features (client-side privacy): - - New KeyAliveSOCKSAuth option to indefinitely extend circuit + - New KeyepAliveIsolateSOCKSAuth option to indefinitely extend circuit lifespan when IsolateSOCKSAuth and streams with SOCKS authentication are attached to the circuit. This allows applications like TorBrowser to manage circuit lifetime on their