commit 17fa269873a561b7ba8f843c3030373014277b3a Author: Damian Johnson atagar@torproject.org Date: Fri Jul 1 15:57:20 2011 -0700

fix: correcting some port types and descriptions

Secure mail ports were misclassified, and descriptions for the mail and web policies were missing ports. --- src/settings.cfg | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/settings.cfg b/src/settings.cfg index 076299d..7f2953f 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -435,8 +435,8 @@ wizard.description.opt Portforward => If needed, attempts NAT traversal using UP wizard.description.opt Startup => Runs Tor in the background when the system starts. wizard.description.opt Notice => Provides a disclaimer that this is an exit on port 80 (http://www.atagar.com/exitNotice). wizard.description.opt Policy => Ports allowed to exit from your relay. The default policy allows for common services while limiting the chance of getting a DMCA takedown for torrent traffic (http://www.atagar.com/exitPolicy). -wizard.description.opt Websites => General Internet browsing including HTTP (80) and HTTPS (443). -wizard.description.opt Email => Protocols for receiving, but not sending email. This includes POP3 (110), POP3S (995), IMAP (143), and IMAPS (993). +wizard.description.opt Websites => General Internet browsing including HTTP (80), HTTPS (443), common alternatives (81, 8008), and proxies (3128, 8080) +wizard.description.opt Email => Protocols for receiving, but not sending email. This includes POP3 (110), POP3S (995), IMAP (143, 220), and IMAPS (993). wizard.description.opt Im => Common instant messaging protocols including Jabber, IRC, ICQ, AIM, Yahoo, MSN, SILC, GroupWise, Gadu-Gadu, Sametime, and Zephyr. wizard.description.opt Misc => Protocols from the default policy that aren't among the above. wizard.description.opt Plaintext => When blocked the policy will exclude ports that aren't commonly encrypted. @@ -836,9 +836,9 @@ port.exit.misc 981 # SofaWare Firewall Administration port.exit.misc 989-990 # FTPS port.exit.misc 991 # NAS port.exit.misc 992 # Telnet -port.exit.misc 993 # IMAPS +port.exit.mail 993 # IMAPS port.exit.im 994 # IRC over SSL -port.exit.misc 995 # POP3S +port.exit.mail 995 # POP3S port.exit.misc 1194 # OpenVPN port.exit.misc 1220 # QuickTime port.exit.misc 1293 # PKT-KRB-IPSec @@ -895,6 +895,8 @@ port.encrypted 749 port.encrypted 981 port.encrypted 989 port.encrypted 990 +port.encrypted 993 +port.encrypted 995 port.encrypted 1194 port.encrypted 1293 port.encrypted 1723