April 2014 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'public/bug11608'
by nickm＠torproject.org 28 Apr '14

28 Apr '14

commit cdc64f020c926cd51b037b85b5eba5bf08d66e7d Merge: 6e8ae50 f4be34f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 28 15:52:57 2014 -0400 Merge remote-tracking branch 'public/bug11608' changes/bug11608 | 5 ++ src/test/bt_test.py | 4 +- src/test/ntor_ref.py | 49 +++++++++------- src/test/slownacl_curve25519.py | 31 ++++++++-- src/test/test_cmdline_args.py | 123 ++++++++++++++++++++++----------------- 5 files changed, 131 insertions(+), 81 deletions(-)

1 0

[tor-browser-bundle/master] Bug 11629: Revert obfsproxy to 0.2.4.
by mikeperry＠torproject.org 28 Apr '14

28 Apr '14

commit 793a4cd404516b032bc696b4b0e6bb43bafb2e18 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 28 20:01:29 2014 +0200 Bug 11629: Revert obfsproxy to 0.2.4. --- Bundle-Data/Docs/ChangeLog.txt | 1 - gitian/versions.beta | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 750537e..e7d5178 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -8,7 +8,6 @@ Tor Browser Bundle 3.6 -- Apr 29 2014 * Bug 7439: Improve download warning dialog text. * Bug 11384: Completely remove hidden toggle menu item. * Update NoScript to 2.6.8.20 - * Update obfs3 transport to 0.2.8 * Update fte transport to 0.2.13 * Backport Pending Tor Patches: * Bug 11156: Additional obfsproxy startup error message fixes diff --git a/gitian/versions.beta b/gitian/versions.beta index 59a18fe..3460248 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -16,7 +16,7 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.8 +OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=0.2.13 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014

1 0

[tor/master] Fix some option names in the manpage.
by nickm＠torproject.org 28 Apr '14

28 Apr '14

commit 346120b608363c6b2b91b83f4f8bff8339a03a01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 28 12:24:33 2014 -0400 Fix some option names in the manpage. Found with 'make check-docs'. Part of 11634. --- doc/tor.1.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index d5147ff..0ec9fe1 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -626,7 +626,7 @@ GENERAL OPTIONS This feature is experimental; don't use it yet unless you're eager to help tracking down bugs. (Default: 0) -[[_UseFilteringSSLBufferevents]] **_UseFilteringSSLBufferevents** **0**|**1**:: +[[UseFilteringSSLBufferevents]] **UseFilteringSSLBufferevents** **0**|**1**:: Tells Tor to do its SSL communication using a chain of bufferevents: one for SSL and one for networking. This option has no effect if bufferevents are disabled (in which case it can't turn on), or @@ -1090,7 +1090,7 @@ The following options are useful only for clients (that is, if increases the odds that an adversary who owns some servers will observe a fraction of your paths. (Default: 1) -[[UseEntryGuardsAsDirectoryGuards]] **UseEntryGuardsAsDirectoryGuards** **0**|**1**:: +[[UseEntryGuardsAsDirGuards]] **UseEntryGuardsAsDirGuards** **0**|**1**:: If this option is set to 1, and UseEntryGuards is also set to 1, we try to use our entry guards as directory guards, and failing that, pick more nodes to act as our directory guards. @@ -1196,7 +1196,7 @@ The following options are useful only for clients (that is, if compatibility, TransListenAddress is only allowed when TransPort is just a port number.) -[[TransProxyType]] **TransProxyTYpe** **default**|**TPROXY**|**ipfw**|**pf-divert**:: +[[TransProxyType]] **TransProxyType** **default**|**TPROXY**|**ipfw**|**pf-divert**:: TransProxyType may only be enabled when there is transparent proxy listener enabled. +

1 0

[tor/master] Fix capitalization of MaxMemInQueues
by nickm＠torproject.org 28 Apr '14

28 Apr '14

commit 1b7e2979854061b46045e5db5d9aa82e0f6c6081 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 28 12:25:52 2014 -0400 Fix capitalization of MaxMemInQueues This won't affect anybody's configuration, but it makes it match what we documented. Fixes part of 11634. --- src/or/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index b8aa7d3..7850e52 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -308,7 +308,7 @@ static config_var_t option_vars_[] = { V(MaxAdvertisedBandwidth, MEMUNIT, "1 GB"), V(MaxCircuitDirtiness, INTERVAL, "10 minutes"), V(MaxClientCircuitsPending, UINT, "32"), - VAR("MaxMeminQueues", MEMUNIT, MaxMemInQueues_raw, "0"), + VAR("MaxMemInQueues", MEMUNIT, MaxMemInQueues_raw, "0"), OBSOLETE("MaxOnionsPending"), V(MaxOnionQueueDelay, MSEC_INTERVAL, "1750 msec"), V(MinMeasuredBWsForAuthToIgnoreAdvertised, INT, "500"),

1 0

[tor/master] Remove a spurious anchor in the manpage. part of 11634.
by nickm＠torproject.org 28 Apr '14

28 Apr '14

commit e0a41335729ccb75fb809adccc595556df20704e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 28 12:25:20 2014 -0400 Remove a spurious anchor in the manpage. part of 11634. --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 0ec9fe1..2356847 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -644,7 +644,7 @@ CLIENT OPTIONS -------------- The following options are useful only for clients (that is, if -[[SocksPort]] **SocksPort**, **TransPort**, **DNSPort**, or **NATDPort** is non-zero): +**SocksPort**, **TransPort**, **DNSPort**, or **NATDPort** is non-zero): [[AllowInvalidNodes]] **AllowInvalidNodes** **entry**|**exit**|**middle**|**introduction**|**rendezvous**|**...**:: If some Tor servers are obviously not working right, the directory

1 0

[tor/master] Remove documentation for obsolete FetchV2Networkstatus
by nickm＠torproject.org 28 Apr '14

28 Apr '14

commit e05f73259973001927db3de8a0f2c890a99d2f5c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 28 12:25:49 2014 -0400 Remove documentation for obsolete FetchV2Networkstatus --- doc/tor.1.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 2356847..47bbc51 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1843,11 +1843,6 @@ if DirPort is non-zero): except that port specifiers are ignored. Any address not matched by some entry in the policy is accepted. -[[FetchV2Networkstatus]] **FetchV2Networkstatus** **0**|**1**:: - If set, we try to fetch the (obsolete, unused) version 2 network status - consensus documents from the directory authorities. No currently - supported Tor version uses them. (Default: 0) - DIRECTORY AUTHORITY SERVER OPTIONS ----------------------------------

1 0

[tor/master] Actually put ExtORPortCookieAuthFile into config.c
by nickm＠torproject.org 28 Apr '14

28 Apr '14

commit 4b519de5f9955cabc363b7217f869cdac5e2f757 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 28 12:23:18 2014 -0400 Actually put ExtORPortCookieAuthFile into config.c Fixes bug 11635; bugfix on 0.2.5.1-alpha. --- changes/bug11635 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+) diff --git a/changes/bug11635 b/changes/bug11635 new file mode 100644 index 0000000..bb5ecee --- /dev/null +++ b/changes/bug11635 @@ -0,0 +1,6 @@ + o Minor bugfixes (pluggable transports): + - Enable the ExtORPortCookieAuthFile option, to allow changing the + default location of the authentication token for the extended OR Port + as used by sever-side pluggable transports. We had implemented this + option before, but the code to make it settable had been omitted. + Fixes bug 11635; bugfix on 0.2.5.1-alpha. diff --git a/src/or/config.c b/src/or/config.c index 3954c58..b8aa7d3 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -237,6 +237,7 @@ static config_var_t option_vars_[] = { V(ExitPortStatistics, BOOL, "0"), V(ExtendAllowPrivateAddresses, BOOL, "0"), VPORT(ExtORPort, LINELIST, NULL), + V(ExtORPortCookieAuthFile, STRING, NULL), V(ExtraInfoStatistics, BOOL, "1"), V(FallbackDir, LINELIST, NULL),

1 0

[tor/master] Provide missing documentation for two options. For 11634.
by nickm＠torproject.org 28 Apr '14

28 Apr '14

commit 03be8c775a86696fe0fbcc533b24ed4d9a0491ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 28 12:37:47 2014 -0400 Provide missing documentation for two options. For 11634. --- doc/tor.1.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 47bbc51..ac8ccfb 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2014,6 +2014,12 @@ DIRECTORY AUTHORITY SERVER OPTIONS When set to 1, IPv6 OR ports are being tested just like IPv4 OR ports. (Default: 0) +[[MinMeasuredBWsForAuthToIgnoreAdvertised]] **MinMeasuredBWsForAuthToIgnoreAdvertised** __N__:: + A total value, in abstract bandwidth units, describing how much + measured total bandwidth an authority should have observed on the network + before it will treat advertised bandwidths as wholly + unreliable. (Default: 500) + HIDDEN SERVICE OPTIONS ---------------------- @@ -2216,6 +2222,10 @@ The following options are used for running a testing Tor network. events. Changing this requires that **TestingTorNetwork** is set. (Default: 0) +[[TestingMinExitFlagThreshold]] **TestingMinExitFlagThreshold** __N__ **KBytes**|**MBytes**|**GBytes**|**KBits**|**MBits**|**GBits**:: + Sets a lower-bound for assigning an exit flag when running as an + authority on a testing network. Overrides the usual default lower bound + of 4 KB. (Default: 0) SIGNALS -------

1 0

[tor/master] changes file for 11634 documentation fixes
by nickm＠torproject.org 28 Apr '14

28 Apr '14

commit 6e8ae50938544a5ed972025dd537374ae533fd68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 28 12:40:23 2014 -0400 changes file for 11634 documentation fixes --- changes/bug11634 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/bug11634 b/changes/bug11634 new file mode 100644 index 0000000..2a52b3fcf --- /dev/null +++ b/changes/bug11634 @@ -0,0 +1,6 @@ + o Documentation: + - Clean up several option names in the manpage to match their real + names, add the missing documentation for a couple of testing and + directory authority options, remove the documentation for a + V2-directory fetching option that no longer exists. Resolves + ticket 11634.

1 0

[tor/master] Fix the check-docs script
by nickm＠torproject.org 28 Apr '14

28 Apr '14

commit 3266f04925b871519f3193890edb5c40f4be0b39 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 28 12:07:57 2014 -0400 Fix the check-docs script We broke it when we added anchors to the manpage. This patch fixes it, and makes it sorta detect missing anchors. --- doc/tor.1.txt | 8 ++++---- scripts/maint/checkOptionDocs.pl | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 79368f5..302547e 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -491,15 +491,15 @@ GENERAL OPTIONS attacker who obtains the logs. If only one severity level is given, all messages of that level or higher will be sent to the listed destination. -**Log** __minSeverity__[-__maxSeverity__] **file** __FILENAME__:: +[[Log2]] **Log** __minSeverity__[-__maxSeverity__] **file** __FILENAME__:: As above, but send log messages to the listed filename. The "Log" option may appear more than once in a configuration file. Messages are sent to all the logs that match their severity level. -**Log** **[**__domain__,...**]**__minSeverity__[-__maxSeverity__] ... **file** __FILENAME__ + +[[Log3]] **Log** **[**__domain__,...**]**__minSeverity__[-__maxSeverity__] ... **file** __FILENAME__ + -**Log** **[**__domain__,...**]**__minSeverity__[-__maxSeverity__] ... **stderr**|**stdout**|**syslog**:: +[[Log4]] **Log** **[**__domain__,...**]**__minSeverity__[-__maxSeverity__] ... **stderr**|**stdout**|**syslog**:: As above, but select messages by range of log severity __and__ by a set of "logging domains". Each logging domain corresponds to an area of functionality inside Tor. You can specify any number of severity ranges @@ -2197,7 +2197,7 @@ The following options are used for running a testing Tor network. Try this often to download a v3 authority certificate before giving up. Changing this requires that **TestingTorNetwork** is set. (Default: 8) -**TestingDirAuthVoteGuard** __node__,__node__,__...__:: +[[TestingDirAuthVoteGuard]] **TestingDirAuthVoteGuard** __node__,__node__,__...__:: A list of identity fingerprints, nicknames, country codes and address patterns of nodes to vote Guard for regardless of their uptime and bandwidth. See the **ExcludeNodes** option for more diff --git a/scripts/maint/checkOptionDocs.pl b/scripts/maint/checkOptionDocs.pl index 23e57b4..94307c6 100755 --- a/scripts/maint/checkOptionDocs.pl +++ b/scripts/maint/checkOptionDocs.pl @@ -41,8 +41,9 @@ loadTorrc("./src/config/torrc.sample.in", \%torrcSampleOptions); my $considerNextLine = 0; open(F, "./doc/tor.1.txt") or die; while (<F>) { - if (m!^\*\*([A-Za-z0-9_]+)\*\*!) { - $manPageOptions{$1} = 1; + if (m!^(?:\[\[([A-za-z0-9_]+)\]\] *)?\*\*([A-Za-z0-9_]+)\*\*!) { + $manPageOptions{$2} = 1; + print "Missing an anchor: $2\n" unless (defined $1 or $2 eq 'tor'); } } close F;

1 0