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

[snowflake/main] Update comments for exported items
by cohosh＠torproject.org 28 Oct '21

28 Oct '21

commit 0e8d41ba4b694b334775fcd9f4330d9b5b31e85c Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Oct 26 15:28:27 2021 -0400 Update comments for exported items --- proxy/lib/snowflake.go | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go index 85f86b2..bd50dc8 100644 --- a/proxy/lib/snowflake.go +++ b/proxy/lib/snowflake.go @@ -2,7 +2,8 @@ Package snowflake_proxy provides functionality for creating, starting, and stopping a snowflake proxy. -To run a proxy, you must first create a proxy configuration +To run a proxy, you must first create a proxy configuration. Unconfigured fields +will be set to the defined defaults. proxy := snowflake_proxy.SnowflakeProxy{ BrokerURL: "https://snowflake-broker.example.com", @@ -45,24 +46,16 @@ import ( "github.com/pion/webrtc/v3" ) -// DefaultBrokerURL is the bamsoftware.com broker, https://snowflake-broker.bamsoftware.com -// Changing this will change the default broker. The recommended way of changing -// the broker that gets used is by passing an argument to Main. -const DefaultBrokerURL = "https://snowflake-broker.bamsoftware.com/" +// DefaultBrokerURL is the snowflake broker run at https://snowflake-broker.torproject.net +const DefaultBrokerURL = "https://snowflake-broker.torproject.net/" -// DefaultProbeURL is the torproject.org ProbeURL, https://snowflake-broker.torproject.net:8443/probe -// Changing this will change the default Probe URL. The recommended way of changing -// the probe that gets used is by passing an argument to Main. +// DefaultProbeURL is run at https://snowflake-broker.torproject.net:8443/probe const DefaultProbeURL = "https://snowflake-broker.torproject.net:8443/probe" -// DefaultRelayURL is the bamsoftware.com Websocket Relay, wss://snowflake.bamsoftware.com/ -// Changing this will change the default Relay URL. The recommended way of changing -// the relay that gets used is by passing an argument to Main. +// DefaultRelayURL is run at wss://snowflake.torproject.net const DefaultRelayURL = "wss://snowflake.bamsoftware.com/" -// DefaultSTUNURL is a stunprotocol.org STUN URL. stun:stun.stunprotocol.org:3478 -// Changing this will change the default STUN URL. The recommended way of changing -// the STUN Server that gets used is by passing an argument to Main. +// DefaultSTUNURL is run at stun:stun.stunprotocol.org:3478 const DefaultSTUNURL = "stun:stun.stunprotocol.org:3478" const pollInterval = 5 * time.Second @@ -95,15 +88,21 @@ var ( client http.Client ) -// SnowflakeProxy is a structure which is used to configure an embedded +// SnowflakeProxy is used to configure an embedded // Snowflake in another Go application. type SnowflakeProxy struct { - Capacity uint - STUNURL string - BrokerURL string + // Capacity is the maximum number of clients a Snowflake will serve. + // Proxies with a capacity of 0 will accept an unlimited number of clients. + Capacity uint + // STUNURL is the URL of the STUN server the proxy will use + STUNURL string + // BrokerURL is the URL of the Snowflake broker + BrokerURL string + // KeepLocalAddresses indicates whether local SDP candidates will be sent to the broker KeepLocalAddresses bool - RelayURL string - shutdown chan struct{} + // RelayURL is the URL of the Snowflake server that all traffic will be relayed to + RelayURL string + shutdown chan struct{} } // Checks whether an IP address is a remote address for the client @@ -485,9 +484,8 @@ func (sf *SnowflakeProxy) runSession(sid string) { } } -// Start configures and starts a Snowflake, fully formed and special. In the -// case of an empty map, defaults are configured automatically and can be -// found in the GoDoc and in main.go +// Start configures and starts a Snowflake, fully formed and special. Configuration +// values that are unset will default to their corresponding default values. func (sf *SnowflakeProxy) Start() { sf.shutdown = make(chan struct{}) @@ -539,7 +537,7 @@ func (sf *SnowflakeProxy) Start() { } } -// Stop calls close on the sf.shutdown channel shutting down the Snowflake. +// Stop closes all existing connections and shuts down the Snowflake. func (sf *SnowflakeProxy) Stop() { close(sf.shutdown) }

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 28 Oct '21

28 Oct '21

commit 27a2b9ef9617515dbc68b4d5dba4c691a77e6c75 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 28 13:47:37 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+fr.po | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 45a30760d3..4cf259a131 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -5,11 +5,11 @@ # 926782667597d71479677e8aab0ad4dc_106149a, 2020 # Curtis Baltimore <curtisbaltimore(a)protonmail.com>, 2021 # Kingouin <tom.pons(a)hotmail.fr>, 2021 -# Matburnx <matboury(a)gmail.com>, 2021 # Emeric Vallespi <evallespi(a)protonmail.com>, 2021 # AO <ao(a)localizationlab.org>, 2021 # Emma Peel, 2021 # PoorPockets McNewHold <poorpocketsmcnewhold(a)protonmail.ch>, 2021 +# Matburnx <matboury(a)gmail.com>, 2021 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-28 11:50+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: PoorPockets McNewHold <poorpocketsmcnewhold(a)protonmail.ch>, 2021\n" +"Last-Translator: Matburnx <matboury(a)gmail.com>, 2021\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -701,7 +701,7 @@ msgstr "" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "* Launch \"Files\" (GNOME Files/Nautilus)" -msgstr "" +msgstr "* Lancer des \"fichiers\" (fichiers GNOME/Nautilus)" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -748,6 +748,8 @@ msgid "" "* When the download is complete, extract the archive with the command `tar " "-xf [TB archive]`." msgstr "" +"* Une fois le téléchargement terminé, extrayez l’archive avec la commande " +"`tar -xf [archive du NT]`." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -755,6 +757,8 @@ msgid "" "* From inside the Tor Browser directory, you can launch Tor Browser by " "running:" msgstr "" +"* Depuis le répertoire du Navigateur Tor, vous pouvez lancer le Navigateur " +"Tor en exécutant :" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -768,6 +772,9 @@ msgid "" "executable. From within this directory run: `chmod +x start-tor-" "browser.desktop`" msgstr "" +"**Note :** Si cette commande échoue à l'exécution, vous devez probablement " +"rendre le fichier exécutable. Depuis ce répertoire exécutez : `chmod +x " +"start-tor-browser.desktop`" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -784,7 +791,7 @@ msgstr "" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "|----------|-----------------|" -msgstr "" +msgstr "|----------|-----------------|" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body)

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 28 Oct '21

28 Oct '21

commit 7fa18e28772f393c1cc4b9f24744c909d8246b53 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 28 13:47:09 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- fr.po | 4 ++-- pl.po | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fr.po b/fr.po index e368c70b90..458abaea1c 100644 --- a/fr.po +++ b/fr.po @@ -44,8 +44,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-04 16:34+0200\n" -"PO-Revision-Date: 2021-10-28 09:25+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-10-28 13:35+0000\n" +"Last-Translator: Matburnx <matboury(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/pl.po b/pl.po index cd0574e438..76535f3ff9 100644 --- a/pl.po +++ b/pl.po @@ -20,6 +20,7 @@ # Konrad W <360kon(a)gmail.com>, 2019 # Marcin S <dzidek1003(a)o2.pl>, 2018,2021 # Marek Adamski, 2021 +# Marek Adamski, 2021 # oirpos <kuba2707(a)gmail.com>, 2015 # phla47 <phla47(a)gmail.com>, 2013 # sebx, 2013-2015 @@ -30,8 +31,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-04 16:34+0200\n" -"PO-Revision-Date: 2021-10-28 09:25+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-10-28 13:22+0000\n" +"Last-Translator: Marek Adamski\n" "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 28 Oct '21

28 Oct '21

commit 99b118225a9e80612aab90bcbae4ad3d9200b489 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Oct 28 13:46:13 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- fr.po | 8 ++++---- pl.po | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/fr.po b/fr.po index f2f54059a9..dcb870ed40 100644 --- a/fr.po +++ b/fr.po @@ -44,8 +44,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-04 16:34+0200\n" -"PO-Revision-Date: 2021-10-28 09:25+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-10-28 13:35+0000\n" +"Last-Translator: Matburnx <matboury(a)gmail.com>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1181,11 +1181,11 @@ msgstr "Langue, mot de passe d’administration et paramètres supplémentaires" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:83 msgid "Tor Bridge" -msgstr "" +msgstr "Pont Tor" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85 msgid "Save the last bridge that you used to connect to Tor" -msgstr "" +msgstr "Enregistrer le dernier pont que vous avez utilisé pour vous connecter à Tor" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "Browser Bookmarks" diff --git a/pl.po b/pl.po index 389d0d2e15..b92ef138bd 100644 --- a/pl.po +++ b/pl.po @@ -20,6 +20,7 @@ # Konrad W <360kon(a)gmail.com>, 2019 # Marcin S <dzidek1003(a)o2.pl>, 2018,2021 # Marek Adamski, 2021 +# Marek Adamski, 2021 # oirpos <kuba2707(a)gmail.com>, 2015 # phla47 <phla47(a)gmail.com>, 2013 # sebx, 2013-2015 @@ -30,8 +31,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-04 16:34+0200\n" -"PO-Revision-Date: 2021-10-28 09:25+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-10-28 13:22+0000\n" +"Last-Translator: Marek Adamski\n" "Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1177,11 +1178,11 @@ msgstr "Język, hasło administracyjne i dodatkowe ustawienia" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:83 msgid "Tor Bridge" -msgstr "" +msgstr "Mostek Tor" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85 msgid "Save the last bridge that you used to connect to Tor" -msgstr "" +msgstr "Zapisz ostatni mostek, którego użyto do połączenia z siecią Tor" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "Browser Bookmarks"

1 0

[tor/main] version: Missing version update in couple files
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit 97c976778aa67f7bdb021904041bece17a8f58c5 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 09:41:13 2021 -0400 version: Missing version update in couple files Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c602d2c5c9..52ec019d01 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ configure_flags="$*" # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.5.11 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-28"], # for 0.4.5.11-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index afcea51596..5e09f0045b 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.5.11" +!define VERSION "0.4.5.11-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 5b8c9a635e..3d3b6ba03e 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.5.11" +#define VERSION "0.4.5.11-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/main] version: Missing version update in couple files
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit 8c970963a9fadd9b5fe3dbfe6835871dede54a3e Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 09:42:08 2021 -0400 version: Missing version update in couple files Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 17ac739b74..366df64609 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2021-09-17"], # for 0.4.7.1-alpha +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-28"], # for 0.4.7.2-alpha-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 5b285a5ca9..51ec48835a 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.7.1-alpha" +!define VERSION "0.4.7.2-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 2d97ea858a..7c9b01ac34 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.7.1-alpha" +#define VERSION "0.4.7.2-alpha-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/main] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit 7c4fd150cd19ebdafe64b800282184014b43d9fb Merge: 97c976778a fa438b6cf0 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 09:42:25 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5

1 0

[tor/main] version: Missing version update in couple files
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit fa438b6cf023df22e78dc2640bcd00da7d08846c Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 09:40:50 2021 -0400 version: Missing version update in couple files Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 7a6566a2c3..1815f65e98 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.5.17" +!define VERSION "0.3.5.17-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index f32c725b07..8170b1bcb4 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.5.17" +#define VERSION "0.3.5.17-dev"

1 0

[tor/main] version: Missing version update in couple files
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit 27caad6f5c3229a9f1c126277c1b5b0051a32445 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 09:41:56 2021 -0400 version: Missing version update in couple files Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 387ad11ffd..1eb613f321 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.6.8 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-28"], # for 0.4.6.8-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index c59769cdb8..be35cd0459 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.6.8" +!define VERSION "0.4.6.8-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index ac4a8e31b2..4bbeced38d 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.6.8" +#define VERSION "0.4.6.8-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 28 Oct '21

28 Oct '21

commit fa405ca27f1aa00d0319ce0bbc99aff99a96e093 Merge: 27caad6f5c 7c4fd150cd Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Oct 28 09:42:32 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6

1 0