September 2021 - tor-commits - lists.torproject.org

[tor-browser/tor-browser-78.14.0esr-11.0-1] Bug 27511: Add new identity button to toolbar
by sysrqb＠torproject.org 07 Sep '21

07 Sep '21

commit cf92cb91988c77fbf88aeecb973c8efdb5d3febe Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Oct 4 19:08:33 2019 +0200 Bug 27511: Add new identity button to toolbar Also added 'New circuit for this site' button to CustomizableUI, but not visible by default. --- browser/base/content/browser.xhtml | 10 ++++++++++ .../components/customizableui/CustomizableUI.jsm | 21 +++++++++++++++++++++ browser/themes/shared/icons/new_circuit.svg | 8 ++++++++ browser/themes/shared/icons/new_identity.svg | 9 +++++++++ browser/themes/shared/jar.inc.mn | 3 +++ browser/themes/shared/menupanel.inc.css | 8 ++++++++ browser/themes/shared/toolbarbutton-icons.inc.css | 8 ++++++++ 7 files changed, 67 insertions(+) diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml index 72c415b8f843..ddf5d766126b 100644 --- a/browser/base/content/browser.xhtml +++ b/browser/base/content/browser.xhtml @@ -1295,6 +1295,16 @@ ondragenter="newWindowButtonObserver.onDragOver(event)" ondragexit="newWindowButtonObserver.onDragExit(event)"/> + <toolbarbutton id="new-identity-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + label="&torbutton.context_menu.new_identity;" + oncommand="torbutton_new_identity();" + tooltiptext="&torbutton.context_menu.new_identity;"/> + + <toolbarbutton id="new-circuit-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + label="&torbutton.context_menu.new_circuit;" + oncommand="torbutton_new_circuit();" + tooltiptext="&torbutton.context_menu.new_circuit;"/> + <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional" observes="View:FullScreen" type="checkbox" diff --git a/browser/components/customizableui/CustomizableUI.jsm b/browser/components/customizableui/CustomizableUI.jsm index e2f006c73464..1c0064249158 100644 --- a/browser/components/customizableui/CustomizableUI.jsm +++ b/browser/components/customizableui/CustomizableUI.jsm @@ -68,6 +68,8 @@ const kSubviewEvents = ["ViewShowing", "ViewHiding"]; */ var kVersion = 16; +var kTorVersion = 1; + /** * Buttons removed from built-ins by version they were removed. kVersion must be * bumped any time a new id is added to this. Use the button id as key, and @@ -566,6 +568,20 @@ var CustomizableUIInternal = { navbarPlacements.push("fxa-toolbar-menu-button"); } } + + let currentTorVersion = gSavedState.currentTorVersion; + if (currentTorVersion < 1 && gSavedState.placements) { + let navbarPlacements = gSavedState.placements[CustomizableUI.AREA_NAVBAR]; + if (navbarPlacements) { + let secLevelIndex = navbarPlacements.indexOf("security-level-button"); + if (secLevelIndex === -1) { + let urlbarIndex = navbarPlacements.indexOf("urlbar-container"); + secLevelIndex = urlbarIndex + 1; + navbarPlacements.splice(secLevelIndex, 0, "security-level-button"); + } + navbarPlacements.splice(secLevelIndex + 1, 0, "new-identity-button"); + } + } }, /** @@ -2369,6 +2385,10 @@ var CustomizableUIInternal = { gSavedState.currentVersion = 0; } + if (!("currentTorVersion" in gSavedState)) { + gSavedState.currentTorVersion = 0; + } + gSeenWidgets = new Set(gSavedState.seen || []); gDirtyAreaCache = new Set(gSavedState.dirtyAreaCache || []); gNewElementCount = gSavedState.newElementCount || 0; @@ -2447,6 +2467,7 @@ var CustomizableUIInternal = { seen: gSeenWidgets, dirtyAreaCache: gDirtyAreaCache, currentVersion: kVersion, + currentTorVersion: kTorVersion, newElementCount: gNewElementCount, }; diff --git a/browser/themes/shared/icons/new_circuit.svg b/browser/themes/shared/icons/new_circuit.svg new file mode 100644 index 000000000000..e0a93cc83502 --- /dev/null +++ b/browser/themes/shared/icons/new_circuit.svg @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <title>Icon / New Circuit(a)1.5x</title> + <g id="Icon-/-New-Circuit" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <path d="M13.4411138,10.1446317 L9.5375349,10.1446317 C8.99786512,10.1446317 8.56164018,10.5818326 8.56164018,11.1205264 C8.56164018,11.6592203 8.99786512,12.0964212 9.5375349,12.0964212 L11.4571198,12.0964212 C10.7554515,13.0479185 9.73466563,13.692009 8.60067597,13.9359827 C8.41818366,13.9720908 8.23276366,14.0033194 8.04734366,14.0218614 C7.97219977,14.0277168 7.89803177,14.0306445 7.82288788,14.0335722 C6.07506044,14.137017 4.290149,13.4499871 3.38647049,11.857327 C2.52280367,10.3349312 2.77263271,8.15966189 3.93687511,6.87343267 C5.12453898,5.56183017 7.44814431,5.04363008 8.21226987,3.38558497 C9.01738301,4.92847451 9.60682342,5.02801577 10.853041,6.15029468 C11.2892659,6.54455615 11.9704404,7.55558307 12.1861132,8.10501179 C12.3051723,8.40949094 12.5013272,9.17947187 12.5013272,9.17947187 L14.2862386,9.17947187 C14.2091429,7.59754654 13.439162,5.96877827 12.2261248,4.93628166 C11.279507,4.13116853 10.5065984,3.84718317 9.77662911,2.8088312 C9.63219669,2.60194152 9.599 99216,2.4565332 9.56290816,2.21646311 C9.53851079,2.00762164 9.54143848,1.78511764 9.62048595,1.53919218 C9.65952174,1.41720534 9.59804037,1.28545955 9.47702943,1.23764071 L6.40296106,0.0167964277 C6.32391359,-0.0134563083 6.23413128,-0.00272146652 6.16679454,0.0480250584 L5.95502539,0.206120002 C5.85743592,0.280288 5.82815908,0.416913259 5.89159223,0.523285783 C6.70060895,1.92564648 6.36978064,2.82542141 5.8984235,3.20211676 C5.4914754,3.4900057 4.99084141,3.72226864 4.63366394,3.95453159 C3.82367132,4.47956294 3.03222071,5.02508808 2.40374451,5.76774396 C0.434388969,8.09427695 0.519291809,12.0046871 2.77165682,14.1077402 C3.65288975,14.9284676 4.70295247,15.4749686 5.81742423,15.7570022 C5.81742423,15.7570022 6.13556591,15.833122 6.21754107,15.8497122 C7.36616915,16.0829511 8.53529102,16.0146384 9.62243774,15.6672199 C9.67416016,15.6525815 9.77174963,15.620377 9.76784605,15.6154975 C10.7730176,15.2700308 11.7049971,14.7010841 12.4652191,13.90573 L12.4652191,15.0241053 C12.4652191, 15.5627992 12.901444,16 13.4411138,16 C13.9798077,16 14.4170085,15.5627992 14.4170085,15.0241053 L14.4170085,11.1205264 C14.4170085,10.5818326 13.9798077,10.1446317 13.4411138,10.1446317" id="Fill-3" fill="context-fill" fill-opacity="context-fill-opacity"></path> + <path d="M5.107,7.462 C4.405,8.078 4,8.946 4,9.839 C4,10.712 4.422,11.57 5.13,12.132 C5.724,12.607 6.627,12.898 7.642,12.949 L7.642,5.8 C7.39,6.029 7.103,6.227 6.791,6.387 C5.993,6.812 5.489,7.133 5.107,7.462" id="Fill-1" fill="context-fill" fill-opacity="context-fill-opacity"></path> + </g> +</svg> diff --git a/browser/themes/shared/icons/new_identity.svg b/browser/themes/shared/icons/new_identity.svg new file mode 100644 index 000000000000..91d5b35f7e80 --- /dev/null +++ b/browser/themes/shared/icons/new_identity.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <title>New Identity Icon</title> + <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="New-Identity-Icon" fill="#000000" fill-rule="nonzero"> + <path d="M4.65687153,14.5532899 L5.79494313,12.0855326 C5.8689125,11.9251399 5.6620883,11.7793527 5.53742729,11.9040137 L3.77194352,13.6694975 L2.32342782,12.2228406 L4.089841,10.4564274 C4.21450201,10.3317664 4.06871482,10.1249422 3.90832206,10.1989116 L1.43773764,11.338287 L0.206601383,10.1087306 C0.0509544211,9.9532834 -0.0167994233,9.75447206 0.00351451705,9.53432844 C0.0238284574,9.31418483 0.154794797,9.13897939 0.330406365,9.0302193 L4.61213917,6.53066101 C4.98542292,6.31331572 5.42541251,6.16259067 5.8659261,6.07796117 C6.63682488,5.92985954 7.40999434,6.06817199 8.09666802,6.42610336 L12.618483,1.910278 C13.0562019,1.47313888 13.7399062,1.45652879 14.1403159,1.87828207 C14.5407256,2.30003536 14.523905,2.96081599 14.0861861,3.39795511 L9.56437119,7.91378047 C9.92258101,8.57753432 10.0391721,9.37155544 9.91292178,10.1416209 C9.85023328,10.5817332 9.67706706,10.9989392 9.45960494,11.3937636 L6.95651989,15.6478297 C6.84761416,15.82321 6.6720026,15.9319701 6.47398108 ,15.9964916 C6.25354962,16.0167745 6.0544801,15.9491049 5.89883314,15.7936577 L4.65687153,14.5532899 L4.65687153,14.5532899 Z M6.35600863,9.57888316 C6.35684236,9.57982492 6.35770616,9.58074275 6.35860024,9.58163642 L7.56801202,10.7899206 C7.78820303,11.010009 8.15567242,10.9533982 8.29166823,10.678253 C8.42766403,10.4031079 8.55818512,10.1511975 8.61427424,9.83946755 C8.73630873,9.14856819 8.51477165,8.45005355 8.01189873,7.92920397 C8.01085853,7.92816425 8.00979562,7.92715687 8.00871022,7.92618158 C8.00773493,7.92509618 8.00672754,7.92403327 8.00568783,7.92299307 C7.48483824,7.42012014 6.7863236,7.19858307 6.09542425,7.32061756 C5.78369428,7.37670668 5.53178393,7.50722777 5.25663877,7.64322357 C4.98149362,7.77921937 4.92488284,8.14668876 5.14497116,8.36687978 L6.35325537,9.57629155 C6.35414904,9.57718564 6.35506687,9.57804944 6.35600863,9.57888316 L6.35600863,9.57888316 Z M3.56503003,4.86094581 C3.44279837,4.85716019 3.33693302,4.76594656 3.31450832,4.6450962 C3.29259157,4.5009814 3 3.24425431,4.36089837 3.1719467,4.23194774 C3.04272848,4.15978087 2.90235166,4.11153221 2.75793184,4.08964745 C2.63678145,4.06729735 2.5453314,3.9616241 2.54155161,3.83961366 C2.53777182,3.71760322 2.62276629,3.61489221 2.74265726,3.59658884 C2.88757581,3.57942626 3.02687427,3.53584537 3.15371096,3.46798665 C3.21938702,3.3436261 3.26061987,3.20700605 3.27529255,3.0651408 C3.29205048,2.94466859 3.39451537,2.85825378 3.5172925,2.86104768 C3.6386065,2.86399065 3.74452528,2.95324633 3.76872081,3.07292141 C3.79288781,3.21715288 3.84342323,3.35694342 3.91777207,3.4852254 C4.04615548,3.55876237 4.18583906,3.60883869 4.32991405,3.63297757 C4.45015386,3.6576218 4.53936117,3.76418021 4.54139495,3.88559216 C4.54342874,4.00700411 4.45770065,4.10814717 4.33816215,4.12536877 C4.1960481,4.14067978 4.05931708,4.18249381 3.9349938,4.24866259 C3.86697751,4.37522253 3.82328954,4.51422019 3.80607564,4.65882867 C3.78847982,4.77811508 3.68677836,4.86339193 3.56503003,4.86094581 Z M14.4103464,14.3126948 C14.2513672,14.307719 14.1137716,14.188804 14.0849193,14.0314492 C14.045996,13.7585014 13.9510862,13.4938971 13.8061961,13.2543814 C13.5663773,13.109665 13.301434,13.0148623 13.0281329,12.9759728 C12.8707684,12.946921 12.75198,12.8095493 12.7470672,12.6509372 C12.7421545,12.492325 12.8525523,12.3587997 13.0082799,12.3350024 C13.2816632,12.3044807 13.5433622,12.2185794 13.7775725,12.0824861 C13.9099238,11.8524988 13.992337,11.5955854 14.0197279,11.3275956 C14.0417134,11.1717293 14.1740126,11.0598594 14.3327736,11.0628895 C14.4905572,11.0667732 14.6282205,11.1831391 14.6593783,11.3389665 C14.703143,11.6110771 14.8017156,11.8740418 14.9490566,12.1117486 C15.1872615,12.2578242 15.450159,12.3559923 15.7221615,12.4004323 C15.8783433,12.4324665 15.9942186,12.5709889 15.9968634,12.7288231 C15.9995083,12.8866572 15.8881575,13.0181443 15.7328877,13.0405352 C15.4641157,13.0669716 15.2064728,13.14931 14.9763475,13.2823129 C14.8406047,13.5164173 14.7548186,13.7777086 14.724105,14.0506041 C14.70 09285,14.2056508 14.5685348,14.3162427 14.4103464,14.3126948 Z M8.37194288,2.75251202 C8.23729358,2.7482977 8.12075529,2.6475812 8.09631849,2.5143077 C8.06335201,2.28313133 7.98296703,2.05902158 7.86025062,1.85616098 C7.65713325,1.73359169 7.43273641,1.65329741 7.2012608,1.62035947 C7.06797908,1.59575373 6.9673698,1.47940513 6.96320889,1.34506671 C6.95904797,1.21072829 7.05255074,1.09763741 7.18444606,1.07748204 C7.41599123,1.0516313 7.6376403,0.978876138 7.83600755,0.863610339 C7.94810399,0.668819911 8.01790485,0.45122403 8.04110388,0.224246882 C8.05972477,0.0922341146 8.17177714,-0.00251545243 8.30624168,5.089704e-05 C8.43987839,0.00334026838 8.55647391,0.101897787 8.58286336,0.233877601 C8.61993042,0.464344927 8.70341768,0.687066016 8.82820981,0.888394549 C9.02996027,1.012115 9.25262444,1.09525963 9.4830002,1.13289867 C9.6152802,1.16003037 9.71342219,1.27735361 9.71566226,1.41103311 C9.71790232,1.5447126 9.62359245,1.65607713 9.49208487,1.67504141 C9.26444525,1.69743199 9.0462315 3,1.76716948 8.85132417,1.87981789 C8.73635526,2.07809534 8.66369764,2.2993991 8.63768445,2.53053117 C8.61805481,2.66184983 8.50592239,2.75551697 8.37194288,2.75251202 Z" id="Shape" fill="context-fill" fill-opacity="context-fill-opacity"></path> + </g> + </g> +</svg> \ No newline at end of file diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn index 71fea38eb829..e4a3c8d2d41c 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -302,3 +302,6 @@ skin/classic/browser/install-ssb.svg (../shared/install-ssb.svg) skin/classic/browser/critical.svg (../shared/icons/critical.svg) skin/classic/browser/webRTC-indicator.css (../shared/webRTC-indicator.css) + + skin/classic/browser/new_circuit.svg (../shared/icons/new_circuit.svg) + skin/classic/browser/new_identity.svg (../shared/icons/new_identity.svg) diff --git a/browser/themes/shared/menupanel.inc.css b/browser/themes/shared/menupanel.inc.css index c919f32a1454..eae453ec5004 100644 --- a/browser/themes/shared/menupanel.inc.css +++ b/browser/themes/shared/menupanel.inc.css @@ -183,3 +183,11 @@ toolbarpaletteitem[place="palette"] > #bookmarks-menu-button, -moz-context-properties: fill, fill-opacity; fill-opacity: 0; } + +#appMenuNewIdentity { + list-style-image: url("chrome://browser/skin/new_identity.svg"); +} + +#appMenuNewCircuit { + list-style-image: url("chrome://browser/skin/new_circuit.svg"); +} diff --git a/browser/themes/shared/toolbarbutton-icons.inc.css b/browser/themes/shared/toolbarbutton-icons.inc.css index 9514eb1d5338..cf02f871c9a4 100644 --- a/browser/themes/shared/toolbarbutton-icons.inc.css +++ b/browser/themes/shared/toolbarbutton-icons.inc.css @@ -233,6 +233,14 @@ toolbar[brighttext] { list-style-image: url("chrome://browser/skin/new-tab.svg"); } +#new-identity-button { + list-style-image: url("chrome://browser/skin/new_identity.svg"); +} + +#new-circuit-button { + list-style-image: url("chrome://browser/skin/new_circuit.svg"); +} + #privatebrowsing-button { list-style-image: url("chrome://browser/skin/privateBrowsing.svg"); }

1 0

[torspec/main] Explain when circuits are torn down, and how they become dirty.
by nickm＠torproject.org 07 Sep '21

07 Sep '21

commit e226989eb19cdbcfa46c6ef9ec6ed866f453a871 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 27 10:46:46 2021 -0400 Explain when circuits are torn down, and how they become dirty. --- path-spec.txt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/path-spec.txt b/path-spec.txt index 65d56c4..235f64b 100644 --- a/path-spec.txt +++ b/path-spec.txt @@ -205,6 +205,11 @@ of their choices. might be supported by a pending or built circuit. For internal circuits, we pick an arbitrary acceptable path, repeating as needed. + Clients consider a circuit to become "dirty" as soon as a stream is + attached to it, or some other request is performed over the circuit. + If a circuit has been "dirty" for at least MaxCircuitDirtiness seconds, + new circuits may not be attached to it. + In some cases we can reuse an already established circuit if it's clean; see Section 2.3 (cannibalizing circuits) for details. @@ -242,8 +247,16 @@ of their choices. 2.1.6. When to tear down circuits - XXXX + Clients should tear down circuits (in general) only when those circuits + have no streams on them. Additionally, clients should tear-down + stream-less circuits only under one of the following conditions: + + - The circuit has never had a stream attached, and it was created too + long in the past (based on CircuitsAvailableTimeout or + cbtlearntimeout, depending on timeout estimate status). + - The circuit is dirty (has had a stream attached), and it has been + dirty for at least MaxCircuitDirtiness. 2.2. Path selection and constraints

1 0

[torspec/main] Note that only three-hop circuits are used as build time observations.
by nickm＠torproject.org 07 Sep '21

07 Sep '21

commit 8f5b7021b65b5379ad7fecc6f0559a21af77d740 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 27 10:47:01 2021 -0400 Note that only three-hop circuits are used as build time observations. --- path-spec.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/path-spec.txt b/path-spec.txt index 235f64b..77368d8 100644 --- a/path-spec.txt +++ b/path-spec.txt @@ -413,6 +413,9 @@ of their choices. good fit over the long term, clients store 1000 most recent circuit build times in a circular array. + These build times only include the times required to build three-hop + circuits. Other circuits' build times are not included. + The Tor client should build test circuits at a rate of one every 'cbttestfreq' (10 seconds) until 'cbtmincircs' (100 circuits) are built, with a maximum of 'cbtmaxopencircs' (default: 10) circuits open at once. This allows a fresh

1 0

[torspec/main] path-spec: describe the behavior of circuit_expire_building()
by nickm＠torproject.org 07 Sep '21

07 Sep '21

commit a282bfc4996b39658b207e9ce1da322de26185cf Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 27 11:11:08 2021 -0400 path-spec: describe the behavior of circuit_expire_building() This is my attempt to extract a general concise rule here. (I am not sure that Tor adjusts both timeout_ms and close_ms, but Arti does indeed adjust both.) --- path-spec.txt | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/path-spec.txt b/path-spec.txt index 0243260..34e3bec 100644 --- a/path-spec.txt +++ b/path-spec.txt @@ -481,7 +481,8 @@ of their choices. F(q) = Xm/((1.0-q)^(1.0/alpha)) - Thus, clients obtain their circuit build timeout by computing: + Thus, clients obtain the circuit build timeout for 3-hop circuits by + computing: timeout_ms = F(0.8) # 'cbtquantile' == 0.8 @@ -500,6 +501,27 @@ of their choices. timeout_ms = MIN(timeout_ms, max_observed_timeout) close_ms = MAX(MIN(close_ms, 2*max_observed_timeout), 'cbtinitialtimeout') +2.4.3. Calculating timeouts thresholds for circuits of different lengths + + The timeout_ms and close_ms estimates above are good only for 3-hop + circuits, since only 3-hop circuits are recorded in the list of build + times. + + To calculate the appropriate timeouts and close timeouts for circuits of + other lengths, the client multiples the timeout_ms and close_ms values + by a scaling factor determined by the number of communication hops + needed to build their circuits: + + timeout_ms[hops=n] = timeout_ms * Actions(N) / Actions(3) + + close_ms[hops=n] = close_ms * Actions(N) / Actions(3) + + where Actions(N) = N * (N + 1) / 2. + + To calculate timeouts for operations other than circuit building, + the client should add X to Actions(N) for every round-trip communication + required with the Xth hop. + 2.4.4. How to record timeouts Pareto estimators begin to lose their accuracy if the tail is omitted.

1 0

[torspec/main] Clarify Xm tiebreaker rules.
by nickm＠torproject.org 07 Sep '21

07 Sep '21

commit 2b92f992ef27ceea3b253a3940a6da3127a0a8b8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 27 10:48:43 2021 -0400 Clarify Xm tiebreaker rules. --- path-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/path-spec.txt b/path-spec.txt index 77368d8..f257e86 100644 --- a/path-spec.txt +++ b/path-spec.txt @@ -449,7 +449,8 @@ of their choices. Instead of using the mode of discrete build times directly, Tor clients compute the Xm parameter using the weighted average of the the midpoints of the 'cbtnummodes' (10) most frequently occurring 10ms histogram bins. - Ties are broken in favor of earlier bins. + Ties are broken in favor of earlier bins (that is, in favor of bins + corresponding to shorter build times). (The use of 10 modes was found to minimize error from the selected cbtquantile, with 10ms bins for quantiles 60-80, compared to many other

1 0

[torspec/main] Describe reload behavior of path-spec data.
by nickm＠torproject.org 07 Sep '21

07 Sep '21

commit de373736ee74a300f68e1355e0cbeed812ca5d80 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 27 11:04:22 2021 -0400 Describe reload behavior of path-spec data. --- path-spec.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/path-spec.txt b/path-spec.txt index f257e86..0243260 100644 --- a/path-spec.txt +++ b/path-spec.txt @@ -423,9 +423,9 @@ of their choices. or network change (see section 2.4.5 below). Timeouts are stored on disk in a histogram of 10ms bin width, the same - width used to calculate the Xm value above. This histogram must be shuffled - after being read from disk, to preserve a proper expiration of old values - after restart. + width used to calculate the Xm value above. The timeouts recorded in the + histogram must be shuffled after being read from disk, to preserve a + proper expiration of old values after restart. Thus, some build time resolution is lost during restart. Implementations may choose a different persistence mechanism than this histogram, but be aware @@ -534,6 +534,13 @@ of their choices. If the timeout was already at least `cbtinitialtimeout`, the client doubles the timeout. + The records here (of how many circuits succeeded or failed among the most + recent 'cbrrecentcount') are also stored as persistent state. On reload, + the history here is reconstructed from the counts by placing successes and + failures in an arbitrary order. (The C Tor implementation shuffles them, + whereas Arti always places failures before successes so that they expire + sooner.) + 2.4.6. Consensus parameters governing behavior Clients that implement circuit build timeout learning should obey the

1 0

[torspec/main] path-spec corrections from Mike.
by nickm＠torproject.org 07 Sep '21

07 Sep '21

commit 62ad3ea125aafd39a7de2907344b79126860d4cc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 7 16:36:16 2021 -0400 path-spec corrections from Mike. --- path-spec.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/path-spec.txt b/path-spec.txt index 46f788d..eb7d6e6 100644 --- a/path-spec.txt +++ b/path-spec.txt @@ -414,8 +414,10 @@ of their choices. times in a circular array. These build times only include the times required to build three-hop - circuits. Other circuits' build times are not included. - + circuits, and the times required to build the first three hops of circuits + with more than three hops. Circuits of fewer than three hops are not + recorded, and hops past the third are not recorded. + The Tor client should build test circuits at a rate of one every 'cbttestfreq' (10 seconds) until 'cbtmincircs' (100 circuits) are built, with a maximum of 'cbtmaxopencircs' (default: 10) circuits open at once. This allows a fresh @@ -557,11 +559,8 @@ of their choices. the client doubles the timeout. The records here (of how many circuits succeeded or failed among the most - recent 'cbrrecentcount') are also stored as persistent state. On reload, - the history here is reconstructed from the counts by placing successes and - failures in an arbitrary order. (The C Tor implementation shuffles them, - whereas Arti always places failures before successes so that they expire - sooner.) + recent 'cbrrecentcount') are not stored as persistent state. On reload, + we start with a new, empty state. 2.4.6. Consensus parameters governing behavior @@ -644,8 +643,10 @@ of their choices. Min: Value of cbtmintimeout Max: 2147483647 (INT32_MAX) Effect: This is the timeout value to use before we have enough data - to compute a timeout, in milliseconds. The circuit close - time defaults to 1.5 times this value. + to compute a timeout, in milliseconds. If we do not have + enough data to compute a timeout estimate (see cbtmincircs), + then we use this interval both for the close timeout and the + abandon timeout. cbtlearntimeout Default: 180

1 0

[torspec/main] cbtinitialtimeout also affects the default abandon timeout.
by nickm＠torproject.org 07 Sep '21

07 Sep '21

commit 710e230e278cf089b3bb81dd5b6c22aaa2702be4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 27 11:14:14 2021 -0400 cbtinitialtimeout also affects the default abandon timeout. --- path-spec.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/path-spec.txt b/path-spec.txt index 34e3bec..46f788d 100644 --- a/path-spec.txt +++ b/path-spec.txt @@ -643,8 +643,9 @@ of their choices. Default: 60000 Min: Value of cbtmintimeout Max: 2147483647 (INT32_MAX) - Effect: This is the timeout value to use before computing a timeout, - in milliseconds. + Effect: This is the timeout value to use before we have enough data + to compute a timeout, in milliseconds. The circuit close + time defaults to 1.5 times this value. cbtlearntimeout Default: 180

1 0

[torspec/main] Merge branch '61_pathspec'
by nickm＠torproject.org 07 Sep '21

07 Sep '21

commit ba6bf07fbf5aa2506fa17c24060f1342acbb9a6b Merge: c17c36c 62ad3ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 7 16:36:34 2021 -0400 Merge branch '61_pathspec' path-spec.txt | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 8 deletions(-)

1 0

[tor-browser-build/master] Bug 40352: Add desktop-only (Windows/macOS/Linux) Makefile rules
by sysrqb＠torproject.org 07 Sep '21

07 Sep '21

commit 77483e8c27641373328e5a360cb2e5e92f883aa7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 2 12:01:34 2021 +0200 Bug 40352: Add desktop-only (Windows/macOS/Linux) Makefile rules --- Makefile | 12 ++++++++++++ doc/MAKEFILE.txt | 10 ++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fbd6e2f..bf0b63b 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,9 @@ release-android-x86_64: submodule-update release-android-aarch64: submodule-update $(rbm) build release --target release --target torbrowser-android-aarch64 +release-desktop: submodule-update + $(rbm) build release --target release --target torbrowser-all-desktop + release-linux-x86_64: submodule-update $(rbm) build release --target release --target torbrowser-linux-x86_64 @@ -59,6 +62,9 @@ alpha-android-x86_64: submodule-update alpha-android-aarch64: submodule-update $(rbm) build release --target alpha --target torbrowser-android-aarch64 +alpha-desktop: submodule-update + $(rbm) build release --target alpha --target torbrowser-all-desktop + alpha-linux-x86_64: submodule-update $(rbm) build release --target alpha --target torbrowser-linux-x86_64 @@ -98,6 +104,9 @@ nightly-android-x86_64: submodule-update nightly-android-aarch64: submodule-update $(rbm) build release --target nightly --target torbrowser-android-aarch64 +nightly-desktop: submodule-update + $(rbm) build release --target nightly --target torbrowser-all-desktop + nightly-linux-x86_64: submodule-update $(rbm) build release --target nightly --target torbrowser-linux-x86_64 @@ -137,6 +146,9 @@ testbuild-android-x86_64: submodule-update testbuild-android-aarch64: submodule-update $(rbm) build release --target testbuild --target torbrowser-android-aarch64 +testbuild-desktop: submodule-update + $(rbm) build release --target testbuild --target torbrowser-all-desktop + testbuild-linux-x86_64: submodule-update $(rbm) build release --target testbuild --target torbrowser-linux-x86_64 diff --git a/doc/MAKEFILE.txt b/doc/MAKEFILE.txt index b198985..9603463 100644 --- a/doc/MAKEFILE.txt +++ b/doc/MAKEFILE.txt @@ -8,9 +8,11 @@ Build Tor Browser for the release channel, for all supported platforms. The resulting build can be found in directory release/$version. release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, - android-x86,android-x86_64,android-aarch64} + android-x86,android-x86_64,android-aarch64,desktop,android} ----------------------------------------------------------------------- -Same as release, for the selected platform only. +Same as release, for the selected platform only. The "desktop" platform +means Linux, Windows and macOS. The "android" platform means android for +all architectures we support. alpha ----- @@ -18,7 +20,7 @@ Build Tor Browser for the alpha channel, for all supported platforms. The resulting build can be found in directory alpha/$version. alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, - android-x86,android-x86_64,android-aarch64} + android-x86,android-x86_64,android-aarch64,desktop,android} --------------------------------------------------------------------- Same as alpha, for the selected platform only. @@ -32,7 +34,7 @@ components. The resulting build can be found in directory nightly/$date nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64,android-armv7, - android-x86,android-x86_64,android-aarch64} + android-x86,android-x86_64,android-aarch64,desktop,android} ----------------------------------------------------------------------- Same as nightly, for the selected platform only.

1 0