- tor-commits - lists.torproject.org

[tor-browser-build/master] Update ChangeLog: add #33630
by sysrqb＠torproject.org 15 Apr '20

15 Apr '20

commit ea9f208259bfe185a35b10cd1e7b9ffd15466ec9 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 15 12:47:45 2020 +0000 Update ChangeLog: add #33630 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 1b34667..7f826ee 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 9.5a12 -- April XX 2020 + * All Platforms + Bug 33630: Remove noisebridge01 default bridge + Tor Browser 9.5a11 -- April 8 2020 * All Platforms * Update Firefox to 68.7.0esr

1 0

[tor-browser-build/master] Revert "Revert "Bug 33630: Remove noisebridge01 default bridge.""
by sysrqb＠torproject.org 15 Apr '20

15 Apr '20

commit 121d6597d436e94b92928f39fade8eb2067e6047 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 15 12:45:04 2020 +0000 Revert "Revert "Bug 33630: Remove noisebridge01 default bridge."" This reverts commit ac8641d245dadc64f0057231f9e593379e9701fc. --- .../tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index a87aa58..282e56f 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -9,15 +9,14 @@ pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 37.218.240.34:40035 pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Revert "Revert "Bug 33630: Pick up tor-android-service patch""
by sysrqb＠torproject.org 15 Apr '20

15 Apr '20

commit 66d52da6b8b6fccdadc926b85a49109f15ef00ab Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 15 12:45:16 2020 +0000 Revert "Revert "Bug 33630: Pick up tor-android-service patch"" This reverts commit 8c408b55345aec7af1be95d722e115df3f877beb. --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index c2994b7..9754ebe 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 18ba7d2780b1d5194cc5854d703655f6c9d3d196 +git_hash: 2a7091dd16842b58bb4ae10dabfddae97c8e3a4a git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor/master] test/channel: Fix a comment typo
by teor＠torproject.org 15 Apr '20

15 Apr '20

commit e3b1e617ae4850280012c95f40e54acdfc897855 Author: teor <teor(a)torproject.org> Date: Wed Apr 15 19:45:56 2020 +1000 test/channel: Fix a comment typo --- src/test/test_channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_channel.c b/src/test/test_channel.c index 5b13f1f97..f7efbd7ab 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -1381,7 +1381,7 @@ test_channel_for_extend(void *arg) tt_str_op(msg, OP_EQ, "Connection is fine; using it."); /* Same creation time, num circuits will be used and they both have 0 so the - * channel 2 should be picked due to how channel_is_better() work. */ + * channel 2 should be picked due to how channel_is_better() works. */ chan2->timestamp_created = chan1->timestamp_created; ret_chan = channel_get_for_extend(digest, &ed_id, &addr, &msg, &launch); tt_assert(ret_chan);

1 0

[chutney/master] TorNet: Rename pid files after tor exits
by teor＠torproject.org 15 Apr '20

15 Apr '20

commit 6282f471e432efa2aadf1046ea6e0fbaca17b434 Author: teor <teor(a)torproject.org> Date: Thu Apr 2 19:46:26 2020 +1000 TorNet: Rename pid files after tor exits Avoids race conditions where chutney tells tor to exit twice. And where chutney tells unrelated processes to exit. Part of 33793. --- lib/chutney/TorNet.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index ff6acf6..b68b240 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -966,11 +966,10 @@ class LocalNodeController(NodeController): return LocalNodeController.NODE_WAIT_FOR_UNCHECKED_DIR_INFO def getPid(self): - """Assuming that this node has its pidfile in ${dir}/pid, return - the pid of the running process, or None if there is no pid in the - file. + """Read the pidfile, and return the pid of the running process. + Returns None if there is no pid in the file. """ - pidfile = os.path.join(self._env['dir'], 'pid') + pidfile = self._env['pidfile'] if not os.path.exists(pidfile): return None @@ -1111,6 +1110,14 @@ class LocalNodeController(NodeController): .format(self._env['nick'])) os.remove(lf) + def cleanup_pidfile(self): + pidfile = self._env['pidfile'] + if not self.isRunning() and os.path.exists(pidfile): + debug("Renaming stale pid file for {} ..." + .format(self._env['nick'])) + # Move the pidfile, so that we don't try to stop the process again + os.rename(pidfile, pidfile + ".old") + def waitOnLaunch(self): """Check whether we can wait() for the tor process to launch""" # TODO: is this the best place for this code? @@ -1925,6 +1932,9 @@ class TorEnviron(chutney.Templating.Environ): def _get_lockfile(self, my): return os.path.join(self['dir'], 'lock') + def _get_pidfile(self, my): + return os.path.join(self['dir'], 'pid') + # A hs generates its key on first run, # so check for it at the last possible moment, # but cache it in memory to avoid repeatedly reading the file @@ -2360,6 +2370,7 @@ class Network(object): - wrote_dot: end a series of logged dots with a newline - any_tor_was_running: wait for STOP_WAIT_TIME for tor to stop - cleanup_runfiles: delete old lockfiles from crashed tors + rename old pid files from stopped tors ''' # make the output clearer by adding a newline if wrote_dot: @@ -2372,10 +2383,12 @@ class Network(object): time.sleep(Network.STOP_WAIT_TIME) # check for stale lock files when Tor crashes + # move aside old pid files after Tor stops running if cleanup_runfiles: controllers = [n.getController() for n in self._nodes] for c in controllers: c.cleanup_lockfile() + c.cleanup_pidfile() def stop(self): any_tor_was_running = False

1 0

[chutney/master] TorNet: Wait slightly longer for tor to exit
by teor＠torproject.org 15 Apr '20

15 Apr '20

commit 983da388243dad70855892b093590adc9ae9ed08 Author: teor <teor(a)torproject.org> Date: Thu Apr 2 19:32:23 2020 +1000 TorNet: Wait slightly longer for tor to exit After stopping, it can take a little while for tor to cleanup. Wait a few extra seconds, to avoid race conditions. Part of 33793. --- lib/chutney/TorNet.py | 57 ++++++++++++++++++++++++++++++++++++---------- tools/test-network-impl.sh | 2 -- 2 files changed, 45 insertions(+), 14 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 7a5c3df..ff6acf6 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -2345,7 +2345,40 @@ class Network(object): msg="Bootstrap failed") return False + # Keep in sync with ShutdownWaitLength in common.i + SHUTDOWN_WAIT_LENGTH = 2 + # Wait for at least two event loops to elapse + EVENT_LOOP_SLOP = 3 + # Wait for this long after signalling tor + STOP_WAIT_TIME = SHUTDOWN_WAIT_LENGTH + EVENT_LOOP_SLOP + + def final_cleanup(self, + wrote_dot, + any_tor_was_running, + cleanup_runfiles): + '''Perform final cleanup actions, based on the arguments: + - wrote_dot: end a series of logged dots with a newline + - any_tor_was_running: wait for STOP_WAIT_TIME for tor to stop + - cleanup_runfiles: delete old lockfiles from crashed tors + ''' + # make the output clearer by adding a newline + if wrote_dot: + sys.stdout.write("\n") + sys.stdout.flush() + + # wait for tor to actually exit + if any_tor_was_running: + print("Waiting for nodes to cleanup and exit.") + time.sleep(Network.STOP_WAIT_TIME) + + # check for stale lock files when Tor crashes + if cleanup_runfiles: + controllers = [n.getController() for n in self._nodes] + for c in controllers: + c.cleanup_lockfile() + def stop(self): + any_tor_was_running = False controllers = [n.getController() for n in self._nodes] for sig, desc in [(signal.SIGINT, "SIGINT"), (signal.SIGINT, "another SIGINT"), @@ -2353,30 +2386,30 @@ class Network(object): print("Sending %s to nodes" % desc) for c in controllers: if c.isRunning(): + any_tor_was_running = True c.stop(sig=sig) print("Waiting for nodes to finish.") wrote_dot = False for n in range(15): time.sleep(1) if all(not c.isRunning() for c in controllers): - # make the output clearer by adding a newline - if wrote_dot: - sys.stdout.write("\n") - sys.stdout.flush() - # check for stale lock file when Tor crashes - for c in controllers: - c.cleanup_lockfile() + self.final_cleanup(wrote_dot, + any_tor_was_running, + True) return sys.stdout.write(".") wrote_dot = True sys.stdout.flush() for c in controllers: c.check(listNonRunning=False) - # make the output clearer by adding a newline - if wrote_dot: - sys.stdout.write("\n") - sys.stdout.flush() - + # cleanup chutney's logging, but don't wait or cleanup files + self.final_cleanup(wrote_dot, + False, + False) + # wait for tor to exit, but don't cleanup logging + self.final_cleanup(False, + any_tor_was_running, + True) def Require(feature): network = _THE_NETWORK diff --git a/tools/test-network-impl.sh b/tools/test-network-impl.sh index c06071e..e73a154 100755 --- a/tools/test-network-impl.sh +++ b/tools/test-network-impl.sh @@ -88,8 +88,6 @@ if [ "$CHUTNEY_STOP_TIME" -ge 0 ]; then $ECHO "chutney stop failed" exit 1 fi - # Give tor time to exit gracefully - sleep 3 else $ECHO "Chutney network verified and running. To stop the network, use:" $ECHO "$CHUTNEY stop $CHUTNEY_NETWORK"

1 0

[chutney/master] TorNet: Improve some nodes path comments
by teor＠torproject.org 15 Apr '20

15 Apr '20

commit a9dc45fd151513aa7374cea929c51cf774a0b9e2 Author: teor <teor(a)torproject.org> Date: Thu Apr 2 19:31:38 2020 +1000 TorNet: Improve some nodes path comments --- lib/chutney/TorNet.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index b2fde0c..7a5c3df 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -177,9 +177,11 @@ def get_absolute_nodes_path(): "nodes*" directory that chutney should use to store the current network's torrcs and tor runtime data. + This path is also used as a prefix for the unique nodes directory + names. + See get_new_absolute_nodes_path() for more details. """ - # there's no way to customise this: we really don't need more options return os.path.join(get_absolute_net_path(), 'nodes') def get_new_absolute_nodes_path(now=time.time()): @@ -2051,7 +2053,8 @@ class Network(object): # if this path exists, it must be a link if os.path.exists(nodeslink) and not os.path.islink(nodeslink): raise RuntimeError( - 'get_absolute_nodes_path returned a path that exists and is not a link') + 'get_absolute_nodes_path returned a path that exists and ' + 'is not a link') # create the new, uniquely named directory, and link it to nodes print("NOTE: creating %r, linking to %r" % (newnodesdir, nodeslink))

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 15 Apr '20

15 Apr '20

commit efa13272bde4b60e1eafd569ca3a9277afd39f59 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 15 06:53:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+nl.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+nl.po b/contents+nl.po index c3c6f21615..7ac667aa68 100644 --- a/contents+nl.po +++ b/contents+nl.po @@ -9,10 +9,10 @@ # Bert Massop <bert.massop(a)gmail.com>, 2019 # IDRASSI Mounir <mounir.idrassi(a)idrix.fr>, 2019 # Meteor0id, 2019 -# Tonnes <tonnes.mb(a)gmail.com>, 2019 # Nathan Follens, 2019 # Joren Vandeweyer <jorenvandeweyer(a)gmail.com>, 2020 -# John Falter <johnfalter9(a)gmail.com>, 2020 +# John Falter, 2020 +# Tonnes <tonnes.mb(a)gmail.com>, 2020 # msgid "" msgstr "" @@ -20,7 +20,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-02-24 13:39+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: John Falter <johnfalter9(a)gmail.com>, 2020\n" +"Last-Translator: Tonnes <tonnes.mb(a)gmail.com>, 2020\n" "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -161,7 +161,7 @@ msgstr "Gemeenschap" #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.title) msgid "Success" -msgstr "Succes" +msgstr "Geslaagd" #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body)

1 0

[translation/torcheck] https://gitweb.torproject.org/translation.git/commit/?h=torcheck
by translation＠torproject.org 15 Apr '20

15 Apr '20

commit b4ac8c188fde99366e1a55c342a86f4a071e6257 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 15 03:22:25 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torcheck --- nl/torcheck.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nl/torcheck.po b/nl/torcheck.po index 6bb9b932dd..77e60b1b0e 100644 --- a/nl/torcheck.po +++ b/nl/torcheck.po @@ -9,7 +9,8 @@ # flabber <flabber(a)online.be>, 2011 # Cleveridge <erwin.de.laat(a)cleveridge.org>, 2014 # Joris de Bock <jorisdebock7(a)gmail.com>, 2015 -# Meteor 0id, 2019 +# kwadronaut <kwadronaut(a)autistici.org>, 2020 +# Meteor0id, 2019 # Oussama El Bachiri <elbachirioussama(a)gmail.com>, 2013 # Richard E. van der Luit <nippur(a)fedoraproject.org>, 2012 # Shondoit Walker <shondoit(a)gmail.com>, 2012 @@ -21,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-10-30 09:32+0000\n" -"Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" +"PO-Revision-Date: 2020-04-15 03:03+0000\n" +"Last-Translator: kwadronaut <kwadronaut(a)autistici.org>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -82,7 +83,7 @@ msgid "Go" msgstr "Start" msgid "Donate to Support Tor" -msgstr "Steun Tor door een Donatie" +msgstr "Steun Tor met een donatie" msgid "Tor Q&A Site" msgstr "Tor Q&A-website"

1 0

[lego/develop] Fix sub-header capitalization
by hiro＠torproject.org 14 Apr '20

14 Apr '20

commit d08dee25e96a81c12727755ecf53414549e7a540 Author: Antonela <hola(a)antonela.me> Date: Mon Apr 13 13:31:01 2020 -0300 Fix sub-header capitalization Seems like someone edited the .css but the fix was removing the class from the header. So, fixed the shared style file and set the proper class to the header element. --- assets/scss/utilities/_text.scss | 6 +++--- templates/header.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/scss/utilities/_text.scss b/assets/scss/utilities/_text.scss index eef0ee7..7445bfc 100644 --- a/assets/scss/utilities/_text.scss +++ b/assets/scss/utilities/_text.scss @@ -24,9 +24,9 @@ // Transformation -.text-lowercase { text-transform: none !important; } -.text-uppercase { text-transform: none !important; } -.text-capitalize { text-transform: none !important; } +.text-lowercase { text-transform: lowercase;} +.text-uppercase { text-transform: uppercase;} +.text-capitalize { text-transform: capitalize;} // Weight and italics diff --git a/templates/header.html b/templates/header.html index 9290699..3e4b29b 100644 --- a/templates/header.html +++ b/templates/header.html @@ -12,7 +12,7 @@ <div class="row"> <div class="col-12 content-center pt-5"> <div class="row"> - <h6 class="mx-auto text-white text-uppercase">{% block section %}{{ this.section }}{% endblock %}</h6> + <h6 class="mx-auto text-white text-capitalize">{% block section %}{{ this.section }}{% endblock %}</h6> </div> <div class="row pb-5"> <h2 class="mx-auto display-3 text-white text-capitalize">{% block title %}{{ this.title }}{% endblock %}</h2>

1 0