October 2016 - tor-commits - lists.torproject.org

[tor/master] Change some dirvote.c comments to reflect reality
by nickm＠torproject.org 24 Oct '16

24 Oct '16

commit 5503eec3aa542faae43dd03a04e229f7cd33a811 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Mon Oct 3 20:43:50 2016 -0400 Change some dirvote.c comments to reflect reality --- changes/20273 | 4 ++++ src/or/dirvote.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/changes/20273 b/changes/20273 new file mode 100644 index 0000000..4b7584d --- /dev/null +++ b/changes/20273 @@ -0,0 +1,4 @@ + o Minor bugfixes (comments): + - Change '1' to 'weight_scale' in consensus bw weights calculation + comments, as that is reality. Fixes bug 20273. Patch from pastly. + diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 9748f4a..83053b9 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -914,7 +914,7 @@ networkstatus_compute_bw_weights_v10(smartlist_t *chunks, int64_t G, Wgd = weight_scale; } } else { // Subcase b: R+D >= S - casename = "Case 2b1 (Wgg=1, Wmd=Wgd)"; + casename = "Case 2b1 (Wgg=weight_scale, Wmd=Wgd)"; Wee = (weight_scale*(E - G + M))/E; Wed = (weight_scale*(D - 2*E + 4*G - 2*M))/(3*D); Wme = (weight_scale*(G-M))/E; @@ -927,7 +927,7 @@ networkstatus_compute_bw_weights_v10(smartlist_t *chunks, int64_t G, weight_scale, G, M, E, D, T, 10, 1); if (berr) { - casename = "Case 2b2 (Wgg=1, Wee=1)"; + casename = "Case 2b2 (Wgg=weight_scale, Wee=weight_scale)"; Wgg = weight_scale; Wee = weight_scale; Wed = (weight_scale*(D - 2*E + G + M))/(3*D); @@ -996,7 +996,7 @@ networkstatus_compute_bw_weights_v10(smartlist_t *chunks, int64_t G, } else { // Subcase b: S+D >= T/3 // D != 0 because S+D >= T/3 if (G < E) { - casename = "Case 3bg (G scarce, Wgg=1, Wmd == Wed)"; + casename = "Case 3bg (G scarce, Wgg=weight_scale, Wmd == Wed)"; Wgg = weight_scale; Wgd = (weight_scale*(D - 2*G + E + M))/(3*D); Wmg = 0; @@ -1008,7 +1008,7 @@ networkstatus_compute_bw_weights_v10(smartlist_t *chunks, int64_t G, berr = networkstatus_check_weights(Wgg, Wgd, Wmg, Wme, Wmd, Wee, Wed, weight_scale, G, M, E, D, T, 10, 1); } else { // G >= E - casename = "Case 3be (E scarce, Wee=1, Wmd == Wgd)"; + casename = "Case 3be (E scarce, Wee=weight_scale, Wmd == Wgd)"; Wee = weight_scale; Wed = (weight_scale*(D - 2*E + G + M))/(3*D); Wme = 0; @@ -1042,7 +1042,7 @@ networkstatus_compute_bw_weights_v10(smartlist_t *chunks, int64_t G, tor_assert(0 < weight_scale && weight_scale <= INT32_MAX); /* - * Provide Wgm=Wgg, Wmm=1, Wem=Wee, Weg=Wed. May later determine + * Provide Wgm=Wgg, Wmm=weight_scale, Wem=Wee, Weg=Wed. May later determine * that middle nodes need different bandwidth weights for dirport traffic, * or that weird exit policies need special weight, or that bridges * need special weight.

1 0

[tor/master] man: Fix default value of AuthDirGuardBWGuarantee to 2MB
by nickm＠torproject.org 24 Oct '16

24 Oct '16

commit 59247314d511022d9d2ec6b3b7c6d6263e72f44c Author: David Goulet <dgoulet(a)torproject.org> Date: Sun Oct 23 10:57:06 2016 -0400 man: Fix default value of AuthDirGuardBWGuarantee to 2MB Closes #20435 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug20435 | 4 ++++ doc/tor.1.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug20435 b/changes/bug20435 new file mode 100644 index 0000000..4fd7eb7 --- /dev/null +++ b/changes/bug20435 @@ -0,0 +1,4 @@ + o Documentation (man page): + - Set the default value from 250 KBytes to 2 MBytes for + AuthDirGuardBWGuarantee in the man page which is what the code is using; + bugfix on tor-0.2.5.6-alpha; Closes ticket 20345. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 9d8b631..221c798 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2248,7 +2248,7 @@ on the public Tor network. [[AuthDirGuardBWGuarantee]] **AuthDirGuardBWGuarantee** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**KBits**|**MBits**|**GBits**:: Authoritative directories only. If non-zero, this advertised capacity or more is always sufficient to satisfy the bandwidth requirement - for the Guard flag. (Default: 250 KBytes) + for the Guard flag. (Default: 2 MBytes) [[AuthDirPinKeys]] **AuthDirPinKeys** **0**|**1**:: Authoritative directories only. If non-zero, do not allow any relay to

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug20435_030_01'
by nickm＠torproject.org 24 Oct '16

24 Oct '16

commit 410f1a438a4f163774e5912ba9ccc6503d178b35 Merge: 961c8f4 5924731 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 24 12:24:37 2016 -0400 Merge remote-tracking branch 'dgoulet/bug20435_030_01' changes/bug20435 | 4 ++++ doc/tor.1.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] Module-document dnsserv.c, policies.c, routerkeys.c
by nickm＠torproject.org 24 Oct '16

24 Oct '16

commit 961c8f4838d36565ef7a54df1ed2cd692db93430 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 24 11:47:40 2016 -0400 Module-document dnsserv.c, policies.c, routerkeys.c --- src/or/dnsserv.c | 20 ++++++++++++++++---- src/or/policies.c | 7 +++++++ src/or/routerkeys.c | 9 +++++++-- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index 04be3e8..8dce832 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -3,10 +3,22 @@ /** * \file dnsserv.c - * \brief Implements client-side DNS proxy server code. Note: - * this is the DNS Server code, not the Server DNS code. Confused? This code - * runs on client-side, and acts as a DNS server. The code in dns.c, on the - * other hand, runs on Tor servers, and acts as a DNS client. + * \brief Implements client-side DNS proxy server code. + * + * When a user enables the DNSPort configuration option to have their local + * Tor client handle DNS requests, this module handles it. It functions as a + * "DNS Server" on the client side, which client applications use. + * + * Inbound DNS requests are represented as entry_connection_t here (since + * that's how Tor represents client-side streams), which are kept associated + * with an evdns_server_request structure as exposed by Libevent's + * evdns code. + * + * Upon receiving a DNS request, libevent calls our evdns_server_callback() + * function here, which causes this module to create an entry_connection_t + * request as appropriate. Later, when that request is answered, + * connection_edge.c calls dnsserv_resolved() so we can finish up and tell the + * DNS client. **/ #include "or.h" diff --git a/src/or/policies.c b/src/or/policies.c index 44a46d2..4b26c69 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -6,6 +6,13 @@ /** * \file policies.c * \brief Code to parse and use address policies and exit policies. + * + * We have two key kinds of address policy: full and compressed. A full + * policy is an array of accept/reject patterns, to be applied in order. + * A short policy is simply a list of ports. This module handles both + * kinds, including generic functions to apply them to addresses, and + * also including code to manage the global policies that we apply to + * incoming and outgoing connections. **/ #define POLICIES_PRIVATE diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index ca32228..7a1a2c9 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -5,8 +5,13 @@ * \file routerkeys.c * * \brief Functions and structures to handle generating and maintaining the - * set of keypairs necessary to be an OR. (Some of the code in router.c - * belongs here.) + * set of keypairs necessary to be an OR. + * + * The keys handled here now are the Ed25519 keys that Tor relays use to sign + * descriptors, authenticate themselves on links, and identify one another + * uniquely. Other keys are maintained in router.c and rendservice.c. + * + * (TODO: The keys in router.c should go here too.) */ #include "or.h"

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 24 Oct '16

24 Oct '16

commit 7cba21fcc7ce6949cbe789342897d9805f3bd287 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 24 15:46:37 2016 +0000 Update translations for torbutton-torbuttondtd --- de/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torbutton.dtd b/de/torbutton.dtd index fa7d8c8..9288149 100644 --- a/de/torbutton.dtd +++ b/de/torbutton.dtd @@ -2,7 +2,7 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.new_circuit "Neuer Kanal für diese Seite"> <!ENTITY torbutton.context_menu.new_circuit_key "K"> -<!ENTITY torbutton.context_menu.preferences "Sicherheitseinstellungen…"> +<!ENTITY torbutton.context_menu.preferences "Sicherheitseinstellungen …"> <!ENTITY torbutton.context_menu.preferences.key "S"> <!ENTITY torbutton.context_menu.networksettings "Tor-Netzwerk-Einstellungen …"> <!ENTITY torbutton.context_menu.networksettings.key "N">

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 24 Oct '16

24 Oct '16

commit b92f700a467b3cf021e512bb9809121dc669eecc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 24 15:46:33 2016 +0000 Update translations for torbutton-torbuttonproperties --- de/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/torbutton.properties b/de/torbutton.properties index c6cdcfe..1e38c45 100644 --- a/de/torbutton.properties +++ b/de/torbutton.properties @@ -29,7 +29,7 @@ torbutton.popup.never_ask_again = Nicht mehr nachfragen torbutton.popup.confirm_newnym = Tor-Browser wird alle Fenster und Reiter schließen. Alle Internetseitensitzungen gehen verloren.\n\nTor-Browser jetzt neu starten, um Ihre Identität zurückzusetzen?\n\n torbutton.slider_notification = Das grüne Onion-Menü hat jetzt einen Sicherheitsschieberegler, mit dem Sie Ihre Sicherheitsstufe anpassen können. Probieren Sie es aus! -torbutton.slider_notification_button = Öffne Sicherheits-Einstellungen +torbutton.slider_notification_button = Sicherheitseinstellungen öffnen torbutton.maximize_warning = Die Maximierung des Tor-Browsers kann Webseiten die Bestimmung Ihrer Bildschirmgröße ermöglichen, um damit Ihre Spur zu verfolgen. Wir empfehlen Ihnen, das Tor-Browser-Fenster in seiner ursprünglichen Standardgröße zu belassen.

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 24 Oct '16

24 Oct '16

commit bc6e4bb9fa2c95e1f2c95023bd5d46010d2777d6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 24 15:46:09 2016 +0000 Update translations for tor-launcher-network-settings_completed --- de/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de/network-settings.dtd b/de/network-settings.dtd index 493f40d..2124fff 100644 --- a/de/network-settings.dtd +++ b/de/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Tor-Netzwerkeinstellungen">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Sprache"> -<!ENTITY torlauncher.localePicker.prompt "Bitte wählen Sie eine Sprache."> +<!ENTITY torlauncher.localePicker.title "Tor-Browser-Sprache"> +<!ENTITY torlauncher.localePicker.prompt "Bitte eine Sprache auswählen.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 24 Oct '16

24 Oct '16

commit 58542b97c7d7cf2cf80e3097c2ecd61c9364098c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 24 15:46:05 2016 +0000 Update translations for tor-launcher-network-settings --- de/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de/network-settings.dtd b/de/network-settings.dtd index 493f40d..2124fff 100644 --- a/de/network-settings.dtd +++ b/de/network-settings.dtd @@ -1,8 +1,8 @@ <!ENTITY torsettings.dialog.title "Tor-Netzwerkeinstellungen">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Sprache"> -<!ENTITY torlauncher.localePicker.prompt "Bitte wählen Sie eine Sprache."> +<!ENTITY torlauncher.localePicker.title "Tor-Browser-Sprache"> +<!ENTITY torlauncher.localePicker.prompt "Bitte eine Sprache auswählen.">

1 0

[tor/master] doxygen says these options are obsolete
by nickm＠torproject.org 24 Oct '16

24 Oct '16

commit ed9845550e1c41d4a6003f9254843590e8f802d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 24 10:31:05 2016 -0400 doxygen says these options are obsolete --- Doxyfile.in | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/Doxyfile.in b/Doxyfile.in index a39348f..4cf9c30 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -446,12 +446,6 @@ MAX_INITIALIZER_LINES = 30 SHOW_USED_FILES = YES -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. The default is NO. - -SHOW_DIRECTORIES = NO - # Set the SHOW_FILES tag to NO to disable the generation of the Files page. # This will remove the Files entry from the Quick Index and from the # Folder Tree View (if specified). The default is YES. @@ -760,12 +754,6 @@ HTML_FOOTER = HTML_STYLESHEET = -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - # If the GENERATE_HTMLHELP tag is set to YES, additional index files # will be generated that can be used as input for tools like the # Microsoft HTML help workshop to generate a compiled HTML help file (.chm) @@ -1047,18 +1035,6 @@ GENERATE_XML = NO XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - # If the XML_PROGRAMLISTING tag is set to YES Doxygen will # dump the program listings (including syntax highlighting # and cross-referencing information) to the XML output. Note that @@ -1264,7 +1240,7 @@ HAVE_DOT = NO # DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory # containing the font. -DOT_FONTNAME = FreeSans +DOT_FONTNAME = # By default doxygen will tell dot to use the output directory to look for the # FreeSans.ttf font (which doxygen will put there itself). If you specify a

1 0

[tor/master] html error in doxygen comment in rendservice.c
by nickm＠torproject.org 24 Oct '16

24 Oct '16

commit e3592cd8b56145201843733523a68b1706ba4556 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 24 10:31:16 2016 -0400 html error in doxygen comment in rendservice.c --- src/or/rendservice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 3afe880..d6bd5b1 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -984,7 +984,7 @@ rend_service_sos_poison_path(const rend_service_t *service) return rend_service_path(service, sos_poison_fname); } -/** Return True if hidden services <b>service> has been poisoned by single +/** Return True if hidden services <b>service</b> has been poisoned by single * onion mode. */ static int service_is_single_onion_poisoned(const rend_service_t *service)

1 0