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

[torbutton/master] Translations update
by gk＠torproject.org 08 Nov '17

08 Nov '17

commit 6c2eaa410c7897d1bcbbe9039c82c39880b3f6c9 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 8 08:15:30 2017 +0000 Translations update --- src/chrome/locale/nl/aboutTBUpdate.dtd | 8 ++++---- src/chrome/locale/pt-BR/aboutTor.properties | 4 ++-- src/chrome/locale/zh-CN/torbutton.dtd | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/chrome/locale/nl/aboutTBUpdate.dtd b/src/chrome/locale/nl/aboutTBUpdate.dtd index e773a68..3fc2ec2 100644 --- a/src/chrome/locale/nl/aboutTBUpdate.dtd +++ b/src/chrome/locale/nl/aboutTBUpdate.dtd @@ -1,6 +1,6 @@ -<!ENTITY aboutTBUpdate.title "Tor-browserupdate"> -<!ENTITY aboutTBUpdate.updated "Tor-browser is bijgewerkt."> -<!ENTITY aboutTBUpdate.linkPrefix "Bezoek voor meer info over deze uitgave"> -<!ENTITY aboutTBUpdate.linkLabel "onze website"> +<!ENTITY aboutTBUpdate.title "Tor Browser Update"> +<!ENTITY aboutTBUpdate.updated "Tor Browser is bijgewerkt."> +<!ENTITY aboutTBUpdate.linkPrefix "Voor de meest recentste informatie over deze release,"> +<!ENTITY aboutTBUpdate.linkLabel "bezoek onze website"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.changeLogHeading "Wijzigingslogboek:"> diff --git a/src/chrome/locale/pt-BR/aboutTor.properties b/src/chrome/locale/pt-BR/aboutTor.properties index ca749aa..44b7303 100644 --- a/src/chrome/locale/pt-BR/aboutTor.properties +++ b/src/chrome/locale/pt-BR/aboutTor.properties @@ -10,8 +10,8 @@ aboutTor.searchDDG.search.link=https://duckduckgo.com/ aboutTor.donationBanner.donate=Faça uma Doação Agora! -aboutTor.donationBanner.slogan=Tor: Desligando a Resistência Digital -aboutTor.donationBanner.mozilla=Faça uma doação hoje e a Mozilla vai doará em dobro! +aboutTor.donationBanner.slogan=Tor: Fortalecendo a Resistência Digital +aboutTor.donationBanner.mozilla=Faça uma doação hoje e a Mozilla doará em dobro! aboutTor.donationBanner.tagline1=Protegendo Jornalistas, Whistleblowers e Ativistas desde 2006 aboutTor.donationBanner.tagline2=Construindo Redes de Liberdade no Mundo Todo diff --git a/src/chrome/locale/zh-CN/torbutton.dtd b/src/chrome/locale/zh-CN/torbutton.dtd index 16bbfda..c02f2c4 100644 --- a/src/chrome/locale/zh-CN/torbutton.dtd +++ b/src/chrome/locale/zh-CN/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_html5_desc "HTML5 视频和音频需通过 NoScript 点击播放。"> <!ENTITY torbutton.prefs.sec_html5_tooltip "在某些网站，可通过 NoScript 工具栏按钮播放这些媒体。"> <!ENTITY torbutton.prefs.sec_some_jit_desc "禁用某些 JavaScript 性能优化。"> -<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT，原生正则表达式。"> +<!ENTITY torbutton.prefs.sec_jit_desc_tooltip "ION JIT，原版RegExp。"> <!ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip "Baseline JIT。"> <!ENTITY torbutton.prefs.sec_jit_slower_desc "一些网站脚本可能会缓执行。"> <!ENTITY torbutton.prefs.sec_mathml_desc "禁用数学方程式的某些显示机制。">

1 0

[tor-browser-bundle/maint-7.0] Revert "Apply follow-up patch for bug 24052"
by gk＠torproject.org 08 Nov '17

08 Nov '17

commit 15c4213ddbfdfe9459291436ba4e4f8cb326e977 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 8 07:46:32 2017 +0000 Revert "Apply follow-up patch for bug 24052" This reverts commit a5388a804d47d7d4fb157beb351ebef9897e8a2b. We ship the patch as usual in the respective tor-browser branch. --- gitian/descriptors/linux/gitian-firefox.yml | 2 -- gitian/descriptors/mac/gitian-firefox.yml | 2 -- gitian/patches/24052_2.patch | 29 ----------------------------- 3 files changed, 33 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 967a981..766bf99 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -37,7 +37,6 @@ files: - "dzip.sh" - "versions" - "24052.patch" -- "24052_2.patch" script: | source versions INSTDIR="$HOME/install" @@ -91,7 +90,6 @@ script: | cd tor-browser patch -p1 < ../24052.patch - patch -p1 < ../24052_2.patch # run get-moz-build-date before removing .git, which is used to get the year chmod +x ~/build/get-moz-build-date eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index a38fc0b..f47afc8 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -25,7 +25,6 @@ files: - "fix-info-plist.py" - "versions" - "24052.patch" -- "24052_2.patch" script: | INSTDIR="$HOME/install/" source versions @@ -39,7 +38,6 @@ script: | cd tor-browser patch -p1 < ../24052.patch - patch -p1 < ../24052_2.patch # Extracting all the necessary tools tar xaf ../MacOSX10.7.sdk.tar.gz tar xaf ../cctools.tar.gz diff --git a/gitian/patches/24052_2.patch b/gitian/patches/24052_2.patch deleted file mode 100644 index 0060428..0000000 --- a/gitian/patches/24052_2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e2c1240ad25f4edcc7d3828b29f6aeb953a24a2e Mon Sep 17 00:00:00 2001 -From: Arthur Edelstein <arthuredelstein(a)gmail.com> -Date: Wed, 1 Nov 2017 02:33:18 -0700 -Subject: [PATCH] Bug 24052: Handle redirects by blocking them early - -This is the second part of the workaround for -https://bugzilla.mozilla.org/show_bug.cgi?id=1412081. - -diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp -index 0e570e8cb57d..b38be48bf0c9 100644 ---- a/netwerk/protocol/http/nsHttpChannel.cpp -+++ b/netwerk/protocol/http/nsHttpChannel.cpp -@@ -5419,6 +5419,13 @@ nsHttpChannel::AsyncProcessRedirection(uint32_t redirectType) - return NS_ERROR_CORRUPTED_CONTENT; - } - -+ bool isRedirectToFile = false; -+ rv = mRedirectURI->SchemeIs("file", &isRedirectToFile); -+ if (!NS_FAILED(rv) && isRedirectToFile) { -+ LOG(("Attempted to redirect from a remote page to a file:// URI.")); -+ return NS_ERROR_FAILURE; -+ } -+ - if (mApplicationCache) { - // if we are redirected to a different origin check if there is a fallback - // cache entry to fall back to. we don't care about file strict --- -2.14.2 -

1 0

[tor-browser-bundle/maint-7.0] Revert "Apply patch for bug 24052"
by gk＠torproject.org 08 Nov '17

08 Nov '17

commit 35f17a0074dd9f0ef3af6079b10300468c2ba8e2 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 8 07:47:14 2017 +0000 Revert "Apply patch for bug 24052" This reverts commit f1366de5a2a67dc5fda27718135ee2cff28c344d. We ship the patch as usual in the respective tor-browser branch. --- gitian/descriptors/linux/gitian-firefox.yml | 2 - gitian/descriptors/mac/gitian-firefox.yml | 2 - gitian/patches/24052.patch | 57 ----------------------------- 3 files changed, 61 deletions(-) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 766bf99..1ff66a2 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -36,7 +36,6 @@ files: - "re-dzip.sh" - "dzip.sh" - "versions" -- "24052.patch" script: | source versions INSTDIR="$HOME/install" @@ -89,7 +88,6 @@ script: | mkdir -p $INSTDIR/Debug/Browser/ cd tor-browser - patch -p1 < ../24052.patch # run get-moz-build-date before removing .git, which is used to get the year chmod +x ~/build/get-moz-build-date eval $(~/build/get-moz-build-date $(cat browser/config/version.txt)) diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index f47afc8..73c46bf 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -24,7 +24,6 @@ files: - "dzip.sh" - "fix-info-plist.py" - "versions" -- "24052.patch" script: | INSTDIR="$HOME/install/" source versions @@ -37,7 +36,6 @@ script: | mkdir -p $OUTDIR/ cd tor-browser - patch -p1 < ../24052.patch # Extracting all the necessary tools tar xaf ../MacOSX10.7.sdk.tar.gz tar xaf ../cctools.tar.gz diff --git a/gitian/patches/24052.patch b/gitian/patches/24052.patch deleted file mode 100644 index a418a97..0000000 --- a/gitian/patches/24052.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c5d1bb91512f9dd20e0f54c6f3e6979588cf9f56 Mon Sep 17 00:00:00 2001 -From: Georg Koppen <gk(a)torproject.org> -Date: Fri, 27 Oct 2017 20:40:57 +0000 -Subject: [PATCH] Bug 24052: Streamline handling of file:// resources - -We should make sure restrictions regarding loading of file:// resources -are adhered to more strictly, at least on *nix platforms. - -This is a workaround for -https://bugzilla.mozilla.org/show_bug.cgi?id=1412081. - -diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp -index 0da79c18ae41..0cc67da7b18f 100644 ---- a/netwerk/base/nsIOService.cpp -+++ b/netwerk/base/nsIOService.cpp -@@ -789,12 +789,20 @@ nsIOService::NewChannelFromURIWithProxyFlagsInternal(nsIURI* aURI, - // if calling newChannel2() fails we try to fall back to - // creating a new channel by calling NewChannel(). - if (NS_FAILED(rv)) { -+#ifdef XP_UNIX -+ if (rv == NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) { -+ return rv; -+ } else { -+#endif - rv = handler->NewChannel(aURI, getter_AddRefs(channel)); - NS_ENSURE_SUCCESS(rv, rv); - // The protocol handler does not implement NewChannel2, so - // maybe we need to wrap the channel (see comment in MaybeWrap - // function). - channel = nsSecCheckWrapChannel::MaybeWrap(channel, aLoadInfo); -+#ifdef XP_UNIX -+ } -+#endif - } - } - -diff --git a/netwerk/protocol/file/nsFileProtocolHandler.cpp b/netwerk/protocol/file/nsFileProtocolHandler.cpp -index e55cb9d47460..c24c928b6f02 100644 ---- a/netwerk/protocol/file/nsFileProtocolHandler.cpp -+++ b/netwerk/protocol/file/nsFileProtocolHandler.cpp -@@ -188,6 +188,13 @@ nsFileProtocolHandler::NewChannel2(nsIURI* uri, - nsILoadInfo* aLoadInfo, - nsIChannel** result) - { -+#ifdef XP_UNIX -+ if (aLoadInfo && aLoadInfo->TriggeringPrincipal()) { -+ if (aLoadInfo->TriggeringPrincipal()->GetIsCodebasePrincipal()) { -+ return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST; -+ } -+ } -+#endif - nsFileChannel *chan = new nsFileChannel(uri); - if (!chan) - return NS_ERROR_OUT_OF_MEMORY; --- -2.14.2 -

1 0

[tor-browser-bundle/maint-7.0] Bug 23396: Updating the msvcr100.dll we ship
by gk＠torproject.org 08 Nov '17

08 Nov '17

commit 50545b66c03d4fc8fb54b48ee6a34287516d43b7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Nov 8 07:43:51 2017 +0000 Bug 23396: Updating the msvcr100.dll we ship We update the location to get the .dll as well, taking Mike out of the browser loop. --- gitian/fetch-inputs.sh | 4 ++-- gitian/versions | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 971cd23..6bd5c13 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -132,14 +132,14 @@ do fi done -for i in OSXSDK MSVCR100 +for i in OSXSDK do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL}${!PACKAGE}" get "${!PACKAGE}" "${MIRROR_URL}${!PACKAGE}" done -for i in CCTOOLS +for i in CCTOOLS MSVCR100 do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL_GK}${!PACKAGE}" diff --git a/gitian/versions b/gitian/versions index cc09cb0..f0c1726 100755 --- a/gitian/versions +++ b/gitian/versions @@ -104,7 +104,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf NOSCRIPT_HASH=82687646b9ecc39d478ac5d4de035b32fdf88efc6faceec3e74b49c863bbfabb CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 -MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 +MSVCR100_HASH=8793353461826fbd48f25ea8b835be204b758ce7510db2af631b28850355bd18 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8

1 0

[tor-browser/tor-browser-52.4.1esr-7.0-1] Bug 1365047 Turn on the Windows DLL Blocklist in MinGW r=aklotz
by gk＠torproject.org 08 Nov '17

08 Nov '17

commit 979accc19fb297b0e73c515924d5dfe5c8236be4 Author: Tom Ritter <tom(a)mozilla.com> Date: Mon May 15 15:49:20 2017 -0500 Bug 1365047 Turn on the Windows DLL Blocklist in MinGW r=aklotz MozReview-Commit-ID: 3hF7iOdH89P --HG-- extra : rebase_source : 95614960544ae55b983dbbd40e1036ff236204b3 --- mozglue/build/WindowsDllBlocklist.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mozglue/build/WindowsDllBlocklist.h b/mozglue/build/WindowsDllBlocklist.h index 5afe6b8ceee8..82d4a365351f 100644 --- a/mozglue/build/WindowsDllBlocklist.h +++ b/mozglue/build/WindowsDllBlocklist.h @@ -6,7 +6,7 @@ #ifndef mozilla_windowsdllblocklist_h #define mozilla_windowsdllblocklist_h -#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) +#if (defined(_MSC_VER) || defined(__MINGW32__)) && (defined(_M_IX86) || defined(_M_X64)) #include <windows.h> #include "mozilla/GuardObjects.h"

1 0

[tor-browser/tor-browser-52.4.1esr-7.0-1] Bug 24052: Handle redirects by blocking them early
by gk＠torproject.org 08 Nov '17

08 Nov '17

commit e2c1240ad25f4edcc7d3828b29f6aeb953a24a2e Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Nov 1 02:33:18 2017 -0700 Bug 24052: Handle redirects by blocking them early This is the second part of the workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1412081. --- netwerk/protocol/http/nsHttpChannel.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index 0e570e8cb57d..b38be48bf0c9 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -5419,6 +5419,13 @@ nsHttpChannel::AsyncProcessRedirection(uint32_t redirectType) return NS_ERROR_CORRUPTED_CONTENT; } + bool isRedirectToFile = false; + rv = mRedirectURI->SchemeIs("file", &isRedirectToFile); + if (!NS_FAILED(rv) && isRedirectToFile) { + LOG(("Attempted to redirect from a remote page to a file:// URI.")); + return NS_ERROR_FAILURE; + } + if (mApplicationCache) { // if we are redirected to a different origin check if there is a fallback // cache entry to fall back to. we don't care about file strict

1 0

[tor-browser/tor-browser-52.4.1esr-7.0-1] Bug 24052: Streamline handling of file:// resources
by gk＠torproject.org 08 Nov '17

08 Nov '17

commit c5d1bb91512f9dd20e0f54c6f3e6979588cf9f56 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 27 20:40:57 2017 +0000 Bug 24052: Streamline handling of file:// resources We should make sure restrictions regarding loading of file:// resources are adhered to more strictly, at least on *nix platforms. This is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1412081. --- netwerk/base/nsIOService.cpp | 8 ++++++++ netwerk/protocol/file/nsFileProtocolHandler.cpp | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp index 0da79c18ae41..0cc67da7b18f 100644 --- a/netwerk/base/nsIOService.cpp +++ b/netwerk/base/nsIOService.cpp @@ -789,12 +789,20 @@ nsIOService::NewChannelFromURIWithProxyFlagsInternal(nsIURI* aURI, // if calling newChannel2() fails we try to fall back to // creating a new channel by calling NewChannel(). if (NS_FAILED(rv)) { +#ifdef XP_UNIX + if (rv == NS_ERROR_FILE_TARGET_DOES_NOT_EXIST) { + return rv; + } else { +#endif rv = handler->NewChannel(aURI, getter_AddRefs(channel)); NS_ENSURE_SUCCESS(rv, rv); // The protocol handler does not implement NewChannel2, so // maybe we need to wrap the channel (see comment in MaybeWrap // function). channel = nsSecCheckWrapChannel::MaybeWrap(channel, aLoadInfo); +#ifdef XP_UNIX + } +#endif } } diff --git a/netwerk/protocol/file/nsFileProtocolHandler.cpp b/netwerk/protocol/file/nsFileProtocolHandler.cpp index e55cb9d47460..c24c928b6f02 100644 --- a/netwerk/protocol/file/nsFileProtocolHandler.cpp +++ b/netwerk/protocol/file/nsFileProtocolHandler.cpp @@ -188,6 +188,13 @@ nsFileProtocolHandler::NewChannel2(nsIURI* uri, nsILoadInfo* aLoadInfo, nsIChannel** result) { +#ifdef XP_UNIX + if (aLoadInfo && aLoadInfo->TriggeringPrincipal()) { + if (aLoadInfo->TriggeringPrincipal()->GetIsCodebasePrincipal()) { + return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST; + } + } +#endif nsFileChannel *chan = new nsFileChannel(uri); if (!chan) return NS_ERROR_OUT_OF_MEMORY;

1 0

[sandboxed-tor-browser/master] Bug 24171: Create the `Caches` directory properly.
by yawning＠torproject.org 08 Nov '17

08 Nov '17

commit 4feaed188124f94458aec2da05893196bc5767c4 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Nov 8 05:01:50 2017 +0000 Bug 24171: Create the `Caches` directory properly. --- ChangeLog | 1 + src/cmd/sandboxed-tor-browser/internal/sandbox/application.go | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1471ea2..92c0182 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ Changes in version 0.0.16 - UNRELEASED: + * Bug 24171: Create the `Caches` directory properly. Changes in version 0.0.15 - 2017-10-30: * Bug 23915: 7.0.7 and later fails to work without `SECCOMP_FILTER_FLAG_TSYNC`. diff --git a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go index d29df34..9d68516 100644 --- a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go +++ b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go @@ -102,12 +102,16 @@ func RunTorBrowser(cfg *config.Config, manif *config.Manifest, tor *tor.Tor) (pr browserHome := filepath.Join(h.homeDir, "sandboxed-tor-browser", "tor-browser", "Browser") realBrowserHome := filepath.Join(cfg.BundleInstallDir, "Browser") + realCachesDir := filepath.Join(realBrowserHome, cachesSubDir) realProfileDir := filepath.Join(realBrowserHome, profileSubDir) realDesktopDir := filepath.Join(realBrowserHome, "Desktop") realDownloadsDir := filepath.Join(realBrowserHome, "Downloads") realExtensionsDir := filepath.Join(realProfileDir, "extensions") // Ensure that the `Caches`, `Downloads` and `Desktop` mount points exist. + if err = os.MkdirAll(realCachesDir, DirMode); err != nil { + return + } if err = os.MkdirAll(realDesktopDir, DirMode); err != nil { return }

1 0

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

07 Nov '17

commit b780e84f256796870857259c16489e90a75a63c7 Merge: ea5ea5f55 3dc61a5d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 7 20:36:04 2017 -0500 Merge branch 'maint-0.3.2' changes/bug23318 | 7 ------- src/or/routerlist.c | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-)

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 059c441d27309d411ed520be293dbf189ab599f4 Merge: 6d6cd2060 3dc61a5d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 7 20:36:04 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug23318 | 7 ------- src/or/routerlist.c | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-)

1 0