November 2017 - tor-commits - lists.torproject.org

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 07 Nov '17

07 Nov '17

commit bf66668e8c2082bf3f0cd5ba2aec91b259347907 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Nov 7 22:45:39 2017 +0000 Update translations for https_everywhere --- nl/https-everywhere.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/https-everywhere.properties b/nl/https-everywhere.properties index 0d5e56b40..624af7493 100644 --- a/nl/https-everywhere.properties +++ b/nl/https-everywhere.properties @@ -4,5 +4,5 @@ https-everywhere.menu.enableDisable = Regels in-/uitschakelen https-everywhere.menu.noRules = (Geen regels voor deze pagina) https-everywhere.menu.unknownRules = (Regels voor deze pagina onbekend) https-everywhere.toolbar.hint = HTTPS Everywhere is nu actief. Je kunt dit aanpassen door op een site-by-site basis te klikken op het icoon in de adresbalk. -https-everywhere.migration.notification0 = Om een cruciale oplossing te bewerkstelligen, reset deze update je HTTPS Everywhere regels voorkeuren naar de standaard waarden. +https-everywhere.migration.notification0 = Om een cruciale oplossing te implementeren, reset deze update je HTTPS Everywhere regel voorkeuren naar de standaard waarden. https-everywhere.menu.ruleset-tests = Voer de HTTPS Everywhere Ruleset Tests uit

1 0

[torspec/master] prop284: Improve the ADD_ONION new key type wording
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit f8122635bc45342243c248d9763b8fbb281a62b7 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 7 15:04:16 2017 -0500 prop284: Improve the ADD_ONION new key type wording Also define the new ed25519 key blob encoding format which is the same format as the current v2 key blob is expected to be in. Closes #24165 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/284-hsv3-control-port.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/proposals/284-hsv3-control-port.txt b/proposals/284-hsv3-control-port.txt index f2d03f6..e229bf9 100644 --- a/proposals/284-hsv3-control-port.txt +++ b/proposals/284-hsv3-control-port.txt @@ -88,11 +88,16 @@ Status: Open New "KeyType" value to "ED25519-V3" which identifies the key type to be a v3 ed25519 key. - New "KeyBlob" value to support the new "ED25519-V3", if specified, will - generate a new ed25519 private key. + With the KeyType == "ED25519-V3", the "KeyBlob" should be a base64 encoded + ed25519 private key. + + The "NEW:BEST" option will still return a version 2 address as long as the + HiddenServiceVersion torrc option default is 2. To ask for a new v3 key, + this should be used: "NEW:ED25519-V3". Because client authentication is not yet implemented, the "ClientAuth" - field is ignored as well as "Flags=BasicAuth". + field is ignored as well as "Flags=BasicAuth". A 513 error is returned if + "ClientAuth" is used with an ED25519-V3 key type. 3.1.4. DEL_ONION

1 0

[torspec/master] prop284: dos2unix the proposal
by dgoulet＠torproject.org 07 Nov '17

07 Nov '17

commit 9a53e606a00233e433e2fa9ddad3b5ad49432fe2 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 7 14:48:35 2017 -0500 prop284: dos2unix the proposal Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/284-hsv3-control-port.txt | 336 ++++++++++++++++++------------------ 1 file changed, 168 insertions(+), 168 deletions(-) diff --git a/proposals/284-hsv3-control-port.txt b/proposals/284-hsv3-control-port.txt index 0bee081..f2d03f6 100644 --- a/proposals/284-hsv3-control-port.txt +++ b/proposals/284-hsv3-control-port.txt @@ -1,168 +1,168 @@ -Filename: 284-hsv3-control-port.txt -Title: Hidden Service v3 Control Port -Author: David Goulet -Created: 02-November-2017 -Status: Open - -1. Summary - - This document extends the hidden service control port events and commands - to version 3 (rend-spec-v3.txt). - - No command nor events are newly added in this document, it only desribes - how the current commands and events are extended to support v3. - -2. Format - - The formatting of this document follows section 2 of control-spec.txt. It - is split in two sections, the Commands and the Events for hidden service - version 3. - - We define the alphabet of a Base64 encoded value to be: - - Base64Character = "A"-"Z" / "a"-"z" / "0"-"9" / "+" / "/" - - For a command or event, if nothing is mentionned, the behavior doesn't - change from the control port specification. - -3. Specification: - -3.1. Commands - - As specified in the control specification, all commands are - case-insensitive but the keywords are case-sensitive. - -3.1.1. GETINFO - - Hidden service commands are: - - "hs/client/desc/id/<ADDR>" - The <ADDR> can be a v3 address without the ".onion" part. The rest is - as is. - - "hs/service/desc/id/<ADDR>" - The <ADDR> can be a v3 address without the ".onion" part. The rest is - as is. - - "onions/{current,detached}" - No change. This command can support v3 hidden service without changes - returning v3 address(es). - -3.1.2. HSFETCH - - The syntax of this command supports both an HSAddress or a versionned - descriptor ID. However, for descriptor ID, version 3 doesn't have the same - concept as v2 so, for v3 the descriptor ID is the blinded key of a - descriptor which is used as an index to query the HSDir: - - The syntax becomes: - "HSFETCH" SP (HSAddress / "v" Version "-" DescId) - *[SP "SERVER=" Server] CRLF - - HSAddress = (16*Base32Character / 56*Base32Character) - Version = "2" / "3" - DescId = (32*Base32Character / 32*Base64Character) - Server = LongName - - The "HSAddress" key is extended to accept 56 base32 characters which is the - format of a version 3 onion address. - - The "DescId" of the form 32*Base64Character is the descriptor blinded key - used as an index to query the directory. It can only be used with - "Version=3". - -3.1.5. HSPOST - - No change. This command can support v3 hidden service without changes. - -3.1.3. ADD_ONION - - For this command to support version 3, new values are added but the syntax - is unchanged: - - "ADD_ONION" SP KeyType ":" KeyBlob - [SP "Flags=" Flag *("," Flag)] - 1*(SP "Port=" VirtPort ["," Target]) - *(SP "ClientAuth=" ClientName [":" ClientBlob]) CRLF - - New "KeyType" value to "ED25519-V3" which identifies the key type to be a - v3 ed25519 key. - - New "KeyBlob" value to support the new "ED25519-V3", if specified, will - generate a new ed25519 private key. - - Because client authentication is not yet implemented, the "ClientAuth" - field is ignored as well as "Flags=BasicAuth". - -3.1.4. DEL_ONION - - The syntax of this command is: - - "DEL_ONION" SP ServiceID CRLF - - ServiceID = The Onion Service address without the trailing ".onion" - suffix - - The "ServiceID" can simply be a v3 address. Nothing else changes. - -3.2. Events - -3.2.1. HS_DESC - - For this event to support vesrion 3, one optional field and new - values are added: - - "650" SP "HS_DESC" SP Action SP HSAddress SP AuthType SP HsDir - [SP DescriptorID] [SP "REASON=" Reason] [SP "REPLICA=" Replica] - [SP "HSDIR_INDEX=" HSDirIndex] - - Action = "REQUESTED" / "UPLOAD" / "RECEIVED" / "UPLOADED" / "IGNORE" / - "FAILED" / "CREATED" - HSAddress = 16*Base32Character / 56*Base32Character / "UNKNOWN" - AuthType = "NO_AUTH" / "BASIC_AUTH" / "STEALTH_AUTH" / "UNKNOWN" - HsDir = LongName / Fingerprint / "UNKNOWN" - DescriptorID = 32*Base32Character / 32*Base64Character - Reason = "BAD_DESC" / "QUERY_REJECTED" / "UPLOAD_REJECTED" / "NOT_FOUND" / - "UNEXPECTED" / "QUERY_NO_HSDIR" - Replica = 1*DIGIT - HSDirIndex = 64*HEXDIG - - The "HSDIR_INDEX=" is an optional field that is only for version 3 which - contains the computed index of the HsDir the descriptor was uploaded to or - fetched from. - - The "HSAddress" key is extended to accept 56 base32 characters which is the - format of a version 3 onion address. - - The "DescriptorID" key is extended to accept 32 base64 characters which is - the descriptor blinded key used for the index value at the "HsDir". - - Because client authentication is not yet implemented, the "AuthType" field - is always "NO_AUTH". - -3.2.2. HS_DESC_CONTENT - - For this event to support version 3, new values are added but the syntax is - unchanged: - - "650" "+" "HS_DESC_CONTENT" SP HSAddress SP DescId SP HsDir CRLF - Descriptor CRLF "." CRLF "650" SP "OK" CRLF - - HSAddress = 16*Base32Character / 56*Base32Character / "UNKNOWN" - DescId = 32*Base32Character / 32*Base64Character - HsDir = LongName / "UNKNOWN" - Descriptor = The text of the descriptor formatted as specified in - rend-spec-v3.txt section 2.4 or empty string on failure. - - The "HSAddress" key is extended to accept 56 base32 characters which is the - format of a version 3 onion address. - - The "DescriptorID" key is extended to accept 32 base64 characters which is - the descriptor blinded key used for the index value at the "HsDir". - -3.2.3 CIRC and CIRC_MINOR - - These circuit events have an optional field named "REND_QUERY" which takes - an "HSAddress". This field is extended to support v3 address: - - HSAddress = 16*Base32Character / 56*Base32Character / "UNKNOWN" +Filename: 284-hsv3-control-port.txt +Title: Hidden Service v3 Control Port +Author: David Goulet +Created: 02-November-2017 +Status: Open + +1. Summary + + This document extends the hidden service control port events and commands + to version 3 (rend-spec-v3.txt). + + No command nor events are newly added in this document, it only desribes + how the current commands and events are extended to support v3. + +2. Format + + The formatting of this document follows section 2 of control-spec.txt. It + is split in two sections, the Commands and the Events for hidden service + version 3. + + We define the alphabet of a Base64 encoded value to be: + + Base64Character = "A"-"Z" / "a"-"z" / "0"-"9" / "+" / "/" + + For a command or event, if nothing is mentionned, the behavior doesn't + change from the control port specification. + +3. Specification: + +3.1. Commands + + As specified in the control specification, all commands are + case-insensitive but the keywords are case-sensitive. + +3.1.1. GETINFO + + Hidden service commands are: + + "hs/client/desc/id/<ADDR>" + The <ADDR> can be a v3 address without the ".onion" part. The rest is + as is. + + "hs/service/desc/id/<ADDR>" + The <ADDR> can be a v3 address without the ".onion" part. The rest is + as is. + + "onions/{current,detached}" + No change. This command can support v3 hidden service without changes + returning v3 address(es). + +3.1.2. HSFETCH + + The syntax of this command supports both an HSAddress or a versionned + descriptor ID. However, for descriptor ID, version 3 doesn't have the same + concept as v2 so, for v3 the descriptor ID is the blinded key of a + descriptor which is used as an index to query the HSDir: + + The syntax becomes: + "HSFETCH" SP (HSAddress / "v" Version "-" DescId) + *[SP "SERVER=" Server] CRLF + + HSAddress = (16*Base32Character / 56*Base32Character) + Version = "2" / "3" + DescId = (32*Base32Character / 32*Base64Character) + Server = LongName + + The "HSAddress" key is extended to accept 56 base32 characters which is the + format of a version 3 onion address. + + The "DescId" of the form 32*Base64Character is the descriptor blinded key + used as an index to query the directory. It can only be used with + "Version=3". + +3.1.5. HSPOST + + No change. This command can support v3 hidden service without changes. + +3.1.3. ADD_ONION + + For this command to support version 3, new values are added but the syntax + is unchanged: + + "ADD_ONION" SP KeyType ":" KeyBlob + [SP "Flags=" Flag *("," Flag)] + 1*(SP "Port=" VirtPort ["," Target]) + *(SP "ClientAuth=" ClientName [":" ClientBlob]) CRLF + + New "KeyType" value to "ED25519-V3" which identifies the key type to be a + v3 ed25519 key. + + New "KeyBlob" value to support the new "ED25519-V3", if specified, will + generate a new ed25519 private key. + + Because client authentication is not yet implemented, the "ClientAuth" + field is ignored as well as "Flags=BasicAuth". + +3.1.4. DEL_ONION + + The syntax of this command is: + + "DEL_ONION" SP ServiceID CRLF + + ServiceID = The Onion Service address without the trailing ".onion" + suffix + + The "ServiceID" can simply be a v3 address. Nothing else changes. + +3.2. Events + +3.2.1. HS_DESC + + For this event to support vesrion 3, one optional field and new + values are added: + + "650" SP "HS_DESC" SP Action SP HSAddress SP AuthType SP HsDir + [SP DescriptorID] [SP "REASON=" Reason] [SP "REPLICA=" Replica] + [SP "HSDIR_INDEX=" HSDirIndex] + + Action = "REQUESTED" / "UPLOAD" / "RECEIVED" / "UPLOADED" / "IGNORE" / + "FAILED" / "CREATED" + HSAddress = 16*Base32Character / 56*Base32Character / "UNKNOWN" + AuthType = "NO_AUTH" / "BASIC_AUTH" / "STEALTH_AUTH" / "UNKNOWN" + HsDir = LongName / Fingerprint / "UNKNOWN" + DescriptorID = 32*Base32Character / 32*Base64Character + Reason = "BAD_DESC" / "QUERY_REJECTED" / "UPLOAD_REJECTED" / "NOT_FOUND" / + "UNEXPECTED" / "QUERY_NO_HSDIR" + Replica = 1*DIGIT + HSDirIndex = 64*HEXDIG + + The "HSDIR_INDEX=" is an optional field that is only for version 3 which + contains the computed index of the HsDir the descriptor was uploaded to or + fetched from. + + The "HSAddress" key is extended to accept 56 base32 characters which is the + format of a version 3 onion address. + + The "DescriptorID" key is extended to accept 32 base64 characters which is + the descriptor blinded key used for the index value at the "HsDir". + + Because client authentication is not yet implemented, the "AuthType" field + is always "NO_AUTH". + +3.2.2. HS_DESC_CONTENT + + For this event to support version 3, new values are added but the syntax is + unchanged: + + "650" "+" "HS_DESC_CONTENT" SP HSAddress SP DescId SP HsDir CRLF + Descriptor CRLF "." CRLF "650" SP "OK" CRLF + + HSAddress = 16*Base32Character / 56*Base32Character / "UNKNOWN" + DescId = 32*Base32Character / 32*Base64Character + HsDir = LongName / "UNKNOWN" + Descriptor = The text of the descriptor formatted as specified in + rend-spec-v3.txt section 2.4 or empty string on failure. + + The "HSAddress" key is extended to accept 56 base32 characters which is the + format of a version 3 onion address. + + The "DescriptorID" key is extended to accept 32 base64 characters which is + the descriptor blinded key used for the index value at the "HsDir". + +3.2.3 CIRC and CIRC_MINOR + + These circuit events have an optional field named "REND_QUERY" which takes + an "HSAddress". This field is extended to support v3 address: + + HSAddress = 16*Base32Character / 56*Base32Character / "UNKNOWN"

1 0

[torspec/master] dir-spec: Document HS v3 consensus params
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit 19e99a118056e30e9a304db2dfcaa83af3d0a6bc Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 1 14:32:53 2017 -0400 dir-spec: Document HS v3 consensus params Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- dir-spec.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dir-spec.txt b/dir-spec.txt index ffbe4d3..3e4afe9 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1966,6 +1966,26 @@ days after it is replaced. (Introduced in 0.3.1.1-alpha; prior versions of tor hardcoded both of these values to 7 days.) + Hidden service v3 parameters: + "hs_intro_min_introduce2" -- Minimum amount of INTRODUCE2 cells + allowed per circuits before rotation. + "hs_intro_max_introduce2" -- Maximum amount of INTRODUCE2 cells + allowed per circuits before rotation. + "hs_intro_min_lifetime" -- Minimum lifetime in seconds that a service + should keep an intro point for. + "hs_intro_max_lifetime" -- Maximum lifetime in seconds that a service + should keep an intro point for. + "hs_intro_num_extra" -- Number of extra intro point a service is + allowed to open. This concept comes from + proposal #155. + "hsdir_interval" -- The length of a time period. See rend-spec-v3.txt + section [TIME-PERIODS]. + "hsdir_n_replicas" -- Number of HSDir replica. + "hsdir_spread_fetch" -- Total number of HSDir per replica a tor client + should select to try to fetch a descriptor. + "hsdir_spread_store" -- Total number of HSDir per replica a service + will upload its descriptor to. + "shared-rand-previous-value" SP NumReveals SP Value NL [At most once]

1 0

[torspec/master] fixup! dir-spec: Document HS v3 consensus params
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit b927962b3cc895044682e6325fe260662b5b6f5d Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Nov 3 16:27:10 2017 +0200 fixup! dir-spec: Document HS v3 consensus params --- dir-spec.txt | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 3e4afe9..ded23eb 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1967,24 +1967,23 @@ prior versions of tor hardcoded both of these values to 7 days.) Hidden service v3 parameters: - "hs_intro_min_introduce2" -- Minimum amount of INTRODUCE2 cells - allowed per circuits before rotation. - "hs_intro_max_introduce2" -- Maximum amount of INTRODUCE2 cells - allowed per circuits before rotation. - "hs_intro_min_lifetime" -- Minimum lifetime in seconds that a service - should keep an intro point for. - "hs_intro_max_lifetime" -- Maximum lifetime in seconds that a service - should keep an intro point for. - "hs_intro_num_extra" -- Number of extra intro point a service is - allowed to open. This concept comes from - proposal #155. - "hsdir_interval" -- The length of a time period. See rend-spec-v3.txt - section [TIME-PERIODS]. - "hsdir_n_replicas" -- Number of HSDir replica. - "hsdir_spread_fetch" -- Total number of HSDir per replica a tor client - should select to try to fetch a descriptor. - "hsdir_spread_store" -- Total number of HSDir per replica a service - will upload its descriptor to. + "hs_intro_min_introduce2" + "hs_intro_max_introduce2" -- Minimum/maximum amount of INTRODUCE2 cells + allowed per circuits before rotation (actual + amount picked at random between these two values). + "hs_intro_min_lifetime" + "hs_intro_max_lifetime" -- Minimum/maximum lifetime in seconds that a service + should keep an intro point for (actual lifetime picked at + random between these two values). + "hs_intro_num_extra" -- Number of extra intro points a service is allowed to open. + This concept comes from proposal #155. + "hsdir_interval" -- The length of a time period. See rend-spec-v3.txt + section [TIME-PERIODS]. + "hsdir_n_replicas" -- Number of HS descriptor replicas. + "hsdir_spread_fetch" -- Total number of HSDirs per replica a tor client + should select to try to fetch a descriptor. + "hsdir_spread_store" -- Total number of HSDirs per replica a service + will upload its descriptor to. "shared-rand-previous-value" SP NumReveals SP Value NL

1 0

[torspec/master] Merge remote-tracking branch 'asn/ticket24118_01'
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit 9485b1b3fe580c2840da9a1d53148afc20347419 Merge: bbb6d34 b927962 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 7 14:28:23 2017 -0500 Merge remote-tracking branch 'asn/ticket24118_01' dir-spec.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit 6d6cd2060f375cbd96b448c0bed67169c309cd65 Merge: 0c8eebd90 c58471325 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 7 14:01:10 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/dirvote.c | 7 +++++++ src/or/networkstatus.c | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.3.2] Recalculate voting schedule first when getting a new consensus
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit 8171d9f50f985de743a415ae5bf61b97e91ce8c8 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 7 11:08:12 2017 -0500 Recalculate voting schedule first when getting a new consensus Because the HS and SR subsystems can use the voting schedule early (with the changes in #23623 making the SR subsystem using the static voting schedule object), we need to recalculate the schedule very early when setting the new consensus. Fixes #24161 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/networkstatus.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 93bb8643d..2660e6a32 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1939,13 +1939,17 @@ networkstatus_set_current_consensus(const char *consensus, } if (is_usable_flavor) { + /* The "current" consensus has just been set and it is a usable flavor so + * the first thing we need to do is recalculate the voting schedule static + * object so we can use the timings in there needed by some subsystems + * such as hidden service and shared random. */ + dirvote_recalculate_timing(options, now); + nodelist_set_consensus(c); /* XXXXNM Microdescs: needs a non-ns variant. ???? NM*/ update_consensus_networkstatus_fetch_time(now); - dirvote_recalculate_timing(options, now); - /* Update ewma and adjust policy if needed; first cache the old value */ old_ewma_enabled = cell_ewma_enabled(); /* Change the cell EWMA settings */

1 0

[tor/maint-0.3.2] Add a safe guard to avoid using a zeroed voting schedule
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit e67f4441eb2646368e3e7cb1bcee403667b786f0 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 7 11:14:45 2017 -0500 Add a safe guard to avoid using a zeroed voting schedule dirvote_get_next_valid_after_time() is the only public function that uses the voting schedule outside of the dirvote subsystem so if it is zeroed, recalculate its timing if we can that is if a consensus exists. Part of #24161 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/dirvote.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index c5ceefecb..33e5ea7d5 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -2859,6 +2859,13 @@ static voting_schedule_t voting_schedule; time_t dirvote_get_next_valid_after_time(void) { + /* This is a safe guard in order to make sure that the voting schedule + * static object is at least initialized. Using this function with a zeroed + * voting schedule can lead to bugs. */ + if (tor_mem_is_zero((const char *) &voting_schedule, + sizeof(voting_schedule))) { + dirvote_recalculate_timing(get_options(), time(NULL)); + } return voting_schedule.interval_starts; }

1 0

[tor/maint-0.3.2] Merge remote-tracking branch 'dgoulet/bug24161_032_01' into maint-0.3.2
by nickm＠torproject.org 07 Nov '17

07 Nov '17

commit c58471325a48f8181d32d45ef75cd23ffd942181 Merge: c7d1d1ad2 e67f4441e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 7 14:00:18 2017 -0500 Merge remote-tracking branch 'dgoulet/bug24161_032_01' into maint-0.3.2 src/or/dirvote.c | 7 +++++++ src/or/networkstatus.c | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)

1 0