May 2022 - tor-commits - lists.torproject.org

[pluggable-transports/snowflake] branch main updated: Wait some time before displaying the proxy usage log
by gitolite role 25 May '22

25 May '22

This is an automated email from the git hooks/post-receive script. cohosh pushed a commit to branch main in repository pluggable-transports/snowflake. The following commit(s) were added to refs/heads/main by this push: new 9757784 Wait some time before displaying the proxy usage log 9757784 is described below commit 9757784c5aa25a6148f7bdf39295b08c738b06d5 Author: itchyonion <itchyonion(a)torproject.com> AuthorDate: Wed Mar 30 12:24:43 2022 -0700 Wait some time before displaying the proxy usage log --- common/task/periodic.go | 6 ++++++ proxy/lib/pt_event_logger.go | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/task/periodic.go b/common/task/periodic.go index 37c56eb..7c1a235 100644 --- a/common/task/periodic.go +++ b/common/task/periodic.go @@ -95,6 +95,12 @@ func (t *Periodic) Start() error { return nil } +func (t *Periodic) WaitThenStart() { + time.AfterFunc(t.Interval, func() { + t.Start() + }) +} + // Close implements common.Closable. func (t *Periodic) Close() error { t.access.Lock() diff --git a/proxy/lib/pt_event_logger.go b/proxy/lib/pt_event_logger.go index df94b0a..cb262e4 100644 --- a/proxy/lib/pt_event_logger.go +++ b/proxy/lib/pt_event_logger.go @@ -13,7 +13,7 @@ func NewProxyEventLogger(logPeriod time.Duration, output io.Writer) event.Snowfl logger := log.New(output, "", log.LstdFlags|log.LUTC) el := &logEventLogger{logPeriod: logPeriod, logger: logger} el.task = &task.Periodic{Interval: logPeriod, Execute: el.logTick} - el.task.Start() + el.task.WaitThenStart() return el } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated: Bug 40474: Bump version of pion/webrtc to v3.1.41
by gitolite role 25 May '22

25 May '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch master in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/master by this push: new 098102f Bug 40474: Bump version of pion/webrtc to v3.1.41 new 20f35d3 Merge remote-tracking branch 'gitlab-tpo/merge-requests/461' 098102f is described below commit 098102fe18b4c25caeaca3d26dbd8d2e40290646 Author: Cecylia Bocovich <cohosh(a)torproject.org> AuthorDate: Tue May 24 21:46:26 2022 -0400 Bug 40474: Bump version of pion/webrtc to v3.1.41 --- projects/goyaml/config | 4 ++-- projects/pion-datachannel/config | 5 +---- projects/pion-dtls/config | 4 ++-- projects/pion-ice/config | 8 +++++++- projects/pion-interceptor/config | 2 +- projects/pion-logging/config | 2 +- projects/pion-mdns/config | 2 +- projects/pion-rtcp/config | 2 +- projects/pion-rtp/config | 2 +- projects/pion-sctp/config | 5 +---- projects/pion-sdp/config | 2 +- projects/pion-srtp/config | 2 +- projects/pion-stun/config | 4 ---- projects/pion-transport/config | 2 +- projects/pion-turn/config | 2 +- projects/pion-udp/config | 2 +- projects/pion-webrtc/config | 7 +++++-- projects/testify/config | 2 +- projects/uuid/config | 2 +- 19 files changed, 30 insertions(+), 31 deletions(-) diff --git a/projects/goyaml/config b/projects/goyaml/config index f631045..f893dc2 100644 --- a/projects/goyaml/config +++ b/projects/goyaml/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_url: https://gopkg.in/yaml.v2 -git_hash: 0b1645d91e851e735d3e23330303ce81f70adbe3 #v2.3.0 +git_url: https://gopkg.in/yaml.v3 +git_hash: 9f266ea9e77c4c7aab4cf02650570e7c7b3031a5 # v3.0.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-datachannel/config b/projects/pion-datachannel/config index e90291d..b92b45e 100644 --- a/projects/pion-datachannel/config +++ b/projects/pion-datachannel/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/datachannel -git_hash: 254d999070fc419be76d05e67e133fbdbc7daaf6 #v1.4.21 +git_hash: 74e13972527c0130d4245897fef9c300a091b14b #v1.5.2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,7 +11,6 @@ var: use_container: 1 go_lib: github.com/pion/datachannel go_lib_deps: - - goerrors - pion-logging - pion-sctp - pion-transport @@ -21,8 +20,6 @@ input_files: - project: container-image - name: go project: go - - name: goerrors - project: goerrors - name: pion-logging project: pion-logging - name: pion-sctp diff --git a/projects/pion-dtls/config b/projects/pion-dtls/config index 26d3d3a..f281abe 100644 --- a/projects/pion-dtls/config +++ b/projects/pion-dtls/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_url: https://github.com/cohosh/dtls -git_hash: 2f8ef4e48879f1129b3432c9ac04d2f4aad8049e #ru fingerprinting fix +git_url: https://github.com/pion/dtls +git_hash: d2f797183a9f044ce976e6df6f362662ca722412 #v2.1.5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-ice/config b/projects/pion-ice/config index 4073134..4f2e34b 100644 --- a/projects/pion-ice/config +++ b/projects/pion-ice/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/ice -git_hash: 55ce2f2b052e0e49812912f058075a6292c83dbd #v2.0.15 +git_hash: 9b523704bbc3c73764dfee81c5215e2c23641ba4 #v2.2.6 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -11,6 +11,7 @@ var: use_container: 1 go_lib: github.com/pion/ice go_lib_deps: + - gocheck - goxnet - pion-dtls - pion-logging @@ -19,6 +20,7 @@ var: - pion-stun - pion-transport - pion-turn + - pretty - testify - uuid @@ -26,6 +28,8 @@ input_files: - project: container-image - name: go project: go + - name: gocheck + project: gocheck - name: goxnet project: goxnet - name: pion-dtls @@ -42,6 +46,8 @@ input_files: project: pion-transport - name: pion-turn project: pion-turn + - name: pretty + project: pretty - name: testify project: testify - name: uuid diff --git a/projects/pion-interceptor/config b/projects/pion-interceptor/config index 97175fc..a45ee5f 100644 --- a/projects/pion-interceptor/config +++ b/projects/pion-interceptor/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/interceptor -git_hash: bc30165ae456af3e8a9ae25e1c3d25dc3a7ccc41 #v0.0.10 +git_hash: ec75ceafde7ff8751f8a2a759208a7b349804d97 #v0.1.11 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-logging/config b/projects/pion-logging/config index 40e8619..e3429ba 100644 --- a/projects/pion-logging/config +++ b/projects/pion-logging/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/logging -git_hash: 0387f8acdeb20faf48e539e74906dd633851f3a8 # v0.2.2 +git_hash: 0387f8acdeb20faf48e539e74906dd633851f3a8 #v0.2.2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-mdns/config b/projects/pion-mdns/config index 510b97c..9bff5af 100644 --- a/projects/pion-mdns/config +++ b/projects/pion-mdns/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/mdns -git_hash: 0200ff62c805e3b691a6b8764f2de93909b90bb3 # v0.0.4 +git_hash: 9199cc788e17df3558f7069ffcf099da260f5913 #v0.0.5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-rtcp/config b/projects/pion-rtcp/config index 117420a..ec163c9 100644 --- a/projects/pion-rtcp/config +++ b/projects/pion-rtcp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/rtcp -git_hash: 2185735bf8f510b85cb8a816cfa03a51478edfe5 #v1.2.6 +git_hash: a4508c4eaed67332f45d8e2d41b9a936b596ca5c #v1.2.9 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-rtp/config b/projects/pion-rtp/config index 2471de8..11a380c 100644 --- a/projects/pion-rtp/config +++ b/projects/pion-rtp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/rtp -git_hash: 0aac647df123bca012506293a9feb6b16938327d #v1.6.2 +git_hash: f47320ba42ace6b75f1f579fc4404c26cf2b0dce #v1.7.13 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-sctp/config b/projects/pion-sctp/config index 946296c..6fb0162 100644 --- a/projects/pion-sctp/config +++ b/projects/pion-sctp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/sctp -git_hash: 685587c17c56677c395bac0fa6329244826938fc #v1.7.11 +git_hash: 7e00bf835f80c3e37a83f4127e14440b647ce316 #v1.8.2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -13,7 +13,6 @@ var: go_lib_deps: - go-spew - gocheck - - goerrors - pion-logging - pion-randutil - pion-transport @@ -28,8 +27,6 @@ input_files: project: go-spew - name: gocheck project: gocheck - - name: goerrors - project: goerrors - name: pion-logging project: pion-logging - name: pion-randutil diff --git a/projects/pion-sdp/config b/projects/pion-sdp/config index 6029587..7e5c26b 100644 --- a/projects/pion-sdp/config +++ b/projects/pion-sdp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/sdp -git_hash: 547e65c63c75339179e5ba8b8d9c06adcea74c31 #v3.0.4 +git_hash: 36cd1e811dcddcbd38730f981533ea7c68fab715 #v3.0.5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-srtp/config b/projects/pion-srtp/config index d476c08..1935197 100644 --- a/projects/pion-srtp/config +++ b/projects/pion-srtp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/srtp -git_hash: 73e8a03e17f465c872c47c2e8c8a400a7aa78fa2 #v2.0.2 +git_hash: 4555d8ddce7c5fdf808d34d2b1a9be4a6458e417 #v2.0.9 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-stun/config b/projects/pion-stun/config index 546e379..00c5111 100644 --- a/projects/pion-stun/config +++ b/projects/pion-stun/config @@ -10,12 +10,8 @@ var: container: use_container: 1 go_lib: github.com/pion/stun - go_lib_deps: - - goerrors input_files: - project: container-image - name: go project: go - - name: goerrors - project: goerrors diff --git a/projects/pion-transport/config b/projects/pion-transport/config index 6e15e6b..ec65560 100644 --- a/projects/pion-transport/config +++ b/projects/pion-transport/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/transport -git_hash: 1d35d73d3858e1d4f2d0bb9f1da455f4731541b4 #v0.12.2 +git_hash: 538d788545fbf8f8379e09ed7747543561bfe8d9 #v0.13.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-turn/config b/projects/pion-turn/config index d8664f9..2a8cf18 100644 --- a/projects/pion-turn/config +++ b/projects/pion-turn/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/turn -git_hash: 73942c387bd12c0d200bb0c6813421cb352cf77c #v2.0.5 +git_hash: ed2e7a9679b43e4040ae932b705d6cbd95536db4 #v2.0.8 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-udp/config b/projects/pion-udp/config index 0da6024..0a939d5 100644 --- a/projects/pion-udp/config +++ b/projects/pion-udp/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/udp -git_hash: adf622c7c621d642f4a954948fc557c5727268d6 #v0.1.0 +git_hash: 534f92eb13db661274eb15a8ea186585e9f1e182 #v0.1.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/pion-webrtc/config b/projects/pion-webrtc/config index 8678a42..6938249 100644 --- a/projects/pion-webrtc/config +++ b/projects/pion-webrtc/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/pion/webrtc -git_hash: 545613dcdeb5dedb01cce94175f40bcbe045df2e #v3.0.15 +git_hash: 7367daf2324b66290f0bdbaab1e51297de1f4989 #v3.1.41 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' @@ -9,9 +9,10 @@ build: '[% c("projects/go/var/build_go_lib") %]' var: container: use_container: 1 - go_lib: github.com/pion/webrtc/v3 + go_lib: github.com/pion/webrtc go_lib_deps: - agouti + - goxcrypto - goxnet - pion-datachannel - pion-dtls @@ -33,6 +34,8 @@ input_files: project: go - name: agouti project: agouti + - name: goxcrypto + project: goxcrypto - name: goxnet project: goxnet - name: pion-datachannel diff --git a/projects/testify/config b/projects/testify/config index 00d98b8..726545f 100644 --- a/projects/testify/config +++ b/projects/testify/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/stretchr/testify -git_hash: acba37e5db06f0093b465a7d47822bf13644b66c #v1.7.0 +git_hash: 083ff1c0449867d0d8d456483ee5fab8e0c0e1e6 #v1.7.1 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' diff --git a/projects/uuid/config b/projects/uuid/config index a7ce469..e53c525 100644 --- a/projects/uuid/config +++ b/projects/uuid/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/google/uuid -git_hash: b5d0d36c983b13c35a93a356a9d2c14da0a1c3ab #v1.1.5 +git_hash: 44b5fee7c49cf3bcdf723f106b36d56ef13ccc88 #v1.3.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' build: '[% c("projects/go/var/build_go_lib") %]' -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated: Remove broken MSVC support
by gitolite role 24 May '22

24 May '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new 65ea7eed1f Remove broken MSVC support new 69e3b8bb84 Merge branch 'tor-gitlab/mr/567' 65ea7eed1f is described below commit 65ea7eed1f32bcb99445ffb45e73561ba735ead8 Author: Alex Xu (Hello71) <alex_y_xu(a)yahoo.ca> AuthorDate: Wed Apr 27 01:27:39 2022 -0400 Remove broken MSVC support MSVC compilation has been broken since at least 1e417b727502 ("All remaining files in src/common belong to the event loop.") deleted src/common/Makefile.nmake in 2018. --- Makefile.am | 1 - Makefile.nmake | 19 --- contrib/win32build/tor.nsi.in | 4 +- doc/building-tor-msvc.txt | 122 -------------------- scripts/maint/update_versions.py | 5 - src/ext/Makefile.nmake | 12 -- src/include.am | 1 - src/test/Makefile.nmake | 35 ------ src/tools/Makefile.nmake | 22 ---- src/win32/include.am | 3 - src/win32/orconfig.h | 242 --------------------------------------- 11 files changed, 2 insertions(+), 464 deletions(-) diff --git a/Makefile.am b/Makefile.am index 280047a71b..c7b8b16d35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -185,7 +185,6 @@ EXTRA_DIST+= \ CODE_OF_CONDUCT \ INSTALL \ LICENSE \ - Makefile.nmake \ README.md \ ReleaseNotes \ scripts/build/combine_libs \ diff --git a/Makefile.nmake b/Makefile.nmake deleted file mode 100644 index 32401b50b7..0000000000 --- a/Makefile.nmake +++ /dev/null @@ -1,19 +0,0 @@ -all: - cd src/common - $(MAKE) /F Makefile.nmake - cd ../../src/ext - $(MAKE) /F Makefile.nmake - cd ../../src/or - $(MAKE) /F Makefile.nmake - cd ../../src/test - $(MAKE) /F Makefile.nmake - -clean: - cd src/common - $(MAKE) /F Makefile.nmake clean - cd ../../src/ext - $(MAKE) /F Makefile.nmake clean - cd ../../src/or - $(MAKE) /F Makefile.nmake clean - cd ../../src/test - $(MAKE) /F Makefile.nmake clean diff --git a/contrib/win32build/tor.nsi.in b/contrib/win32build/tor.nsi.in index dd24df454c..2d8c2b9adf 100644 --- a/contrib/win32build/tor.nsi.in +++ b/contrib/win32build/tor.nsi.in @@ -5,8 +5,8 @@ ; NOTE: This file might be obsolete. Look at tor-mingw.nsi.in instead. ;----------------------------------------- ; How to make an installer: -; Step 0. If you are a Tor maintainer, make sure that tor.nsi and -; src/win32/orconfig.h all have the correct version number. +; Step 0. If you are a Tor maintainer, make sure that tor.nsi has +; the correct version number. ; Step 1. Download and install OpenSSL. Make sure that the OpenSSL ; version listed below matches the one you downloaded. ; Step 2. Download and install NSIS (http://nsis.sourceforge.net) diff --git a/doc/building-tor-msvc.txt b/doc/building-tor-msvc.txt deleted file mode 100644 index dbc644d172..0000000000 --- a/doc/building-tor-msvc.txt +++ /dev/null @@ -1,122 +0,0 @@ -Building Tor with MSVC. -======================= - -NOTE: This is not the preferred method for building Tor on windows: we use -mingw for our packages. - -Last updated 9 September 2014. - - -Requirements: -------------- - - * Visual Studio 2010 - https://go.microsoft.com/fwlink/?LinkId=323467 - * CMake 2.8.12.2 - https://www.cmake.org/download/ - * Perl 5.16 - https://www.activestate.com/activeperl/downloads - * Latest stable OpenSSL tarball - https://www.openssl.org/source/ - * Latest stable zlib tarball - https://zlib.net/ - * Latest stable libevent Libevent tarball - https://github.com/libevent/libevent/releases - -Make sure you check signatures for all these packages. - -Steps: ------- - -Building OpenSSL from source as a shared library: - - cd <openssl source dir> - perl Configure VC-WIN32 - perl util\mkfiles.pl >MINFO - perl util\mk1mf.pl no-asm dll VC-WIN32 >32dll.mak - perl util\mkdef.pl 32 libeay > ms\libeay32.def - perl util\mkdef.pl 32 ssleay > ms\ssleay32.def - nmake -f 32dll.mak - -Making OpenSSL final package: - - Create <openssl final package dir>, I'd recommend using a name like <openssl - source dir>-vc10. - - Copy the following directories and files to their respective locations - <openssl source dir>\inc32\openssl => <openssl final package dir>\include\openssl - <openssl source dir>\out32dll\libeay32.lib => <openssl final package dir>\lib\libeay32.lib - <openssl source dir>\out32dll\ssleay32.lib => <openssl final package dir>\lib\ssleay32.lib - <openssl source dir>\out32dll\libeay32.dll => <openssl final package dir>\bin\libeay32.dll - <openssl source dir>\out32dll\openssl.exe => <openssl final package dir>\bin\openssl.exe - <openssl source dir>\out32dll\ssleay32.dll => <openssl final package dir>\bin\ssleay32.dll - -Building Zlib from source: - - cd <zlib source dir> - nmake -f win32/Makefile.msc - -Building libevent: - - cd <libevent source dir> - mkdir build && cd build - SET OPENSSL_ROOT_DIR=<openssl final package dir> - cmake -G "NMake Makefiles" .. -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="/MT /Zi /O2 /Ob1 /D NDEBUG" -DZLIB_LIBRARY:FILEPATH="<zlib source dir>\zdll.lib" -DZLIB_INCLUDE_DIR:PATH="<zlib source dir>" - nmake event - -Building Tor: - - Create a dir above tor source dir named build-alpha and two subdirs include - and lib. - - Your build tree should now be similar to this one: - * build-alpha - - include - - lib - * <libevent source dir> - - build - - cmake - - ... - * <openssl source dir> - - ... - - ms - - util - - ... - * <openssl final package dir> - - bin - - include - - lib - * <tor source dir> - - ... - - src - - ... - * <zlib source dir> - - ... - - win32 - - ... - - Copy the following dirs and files to the following locations: - <openssl final package dir>\include\openssl => build-alpha\include\openssl - <libevent source dir>\include => build-alpha\include - <libevent source dir>\WIN32-Code\nmake\event2 => build-alpha\include\event2 - <zlib source dir>\z*.h => build-alpha\include\z*.h - - Now copy the following files to the following locations and rename them - according new names: - - <libevent source dir>\build\lib\event.lib => build-alpha\lib\libevent.lib - <openssl final package dir>\lib\libeay32.lib => build-alpha\lib\libcrypto.lib - <openssl final package dir>\lib\ssleay32.lib => build-alpha\lib\libssl.lib - <zlib source dir>\zdll.lib => build-alpha\lib\libz.lib - - And we are now ready for the build process: - - cd <tor source dir> - nmake -f Makefile.nmake - - After the above process is completed there should be a tor.exe in <tor - source dir>\src\or - - Copy tor.exe to desired location and also copy zlib1.dll, libeay32.dll and - ssleay32.dll from built zlib and openssl packages - diff --git a/scripts/maint/update_versions.py b/scripts/maint/update_versions.py index 07de1c343a..361dbe2cd3 100755 --- a/scripts/maint/update_versions.py +++ b/scripts/maint/update_versions.py @@ -129,8 +129,3 @@ update_file(P("contrib/win32build/tor-mingw.nsi.in"), re.compile(r'!define VERSION .*'), u'!define VERSION "{}"'.format(version), encoding="iso-8859-1") - -# In src/win32/orconfig.h, we replace the definition of VERSION. -update_file(P("src/win32/orconfig.h"), - re.compile(r'#define VERSION .*'), - u'#define VERSION "{}"'.format(version)) diff --git a/src/ext/Makefile.nmake b/src/ext/Makefile.nmake deleted file mode 100644 index d02d03bf41..0000000000 --- a/src/ext/Makefile.nmake +++ /dev/null @@ -1,12 +0,0 @@ -all: csiphash.lib - -CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \ - /I ..\ext - -CSIPHASH_OBJECTS = csiphash.obj - -csiphash.lib: $(CSIPHASH_OBJECTS) - lib $(CSIPHASH_OBJECTS) $(CURVE25519_DONNA_OBJECTS) /out:csiphash.lib - -clean: - del *.obj *.lib diff --git a/src/include.am b/src/include.am index 36d323e6eb..29a392a132 100644 --- a/src/include.am +++ b/src/include.am @@ -87,6 +87,5 @@ include src/app/include.am include src/test/include.am include src/tools/include.am -include src/win32/include.am include src/config/include.am include src/test/fuzz/include.am diff --git a/src/test/Makefile.nmake b/src/test/Makefile.nmake deleted file mode 100644 index ca6a84cf8a..0000000000 --- a/src/test/Makefile.nmake +++ /dev/null @@ -1,35 +0,0 @@ -all: test.exe bench.exe - -CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common /I ..\or \ - /I ..\ext - -LIBS = ..\..\..\build-alpha\lib\libevent.lib \ - ..\..\..\build-alpha\lib\libcrypto.lib \ - ..\..\..\build-alpha\lib\libssl.lib \ - ..\..\..\build-alpha\lib\libz.lib \ - ..\or\libtor.lib \ - ws2_32.lib advapi32.lib shell32.lib \ - crypt32.lib gdi32.lib user32.lib - -TEST_OBJECTS = test.obj test_addr.obj test_channel.obj test_channeltls.obj \ - test_consdiff.obj test_containers.obj \ - test_controller_events.obj test_crypto.obj test_data.obj test_dir.obj \ - test_checkdir.obj test_microdesc.obj test_pt.obj test_util.obj \ - test_config.obj test_connection.obj \ - test_cell_formats.obj test_relay.obj test_replay.obj \ - test_channelpadding.obj \ - test_circuitstats.obj \ - test_circuitpadding.obj \ - test_scheduler.obj test_introduce.obj test_hs.obj tinytest.obj - -tinytest.obj: ..\ext\tinytest.c - $(CC) $(CFLAGS) /D snprintf=_snprintf /c ..\ext\tinytest.c - -test.exe: $(TEST_OBJECTS) - $(CC) $(CFLAGS) $(LIBS) ..\common\*.lib $(TEST_OBJECTS) /Fe$@ - -bench.exe: bench.obj - $(CC) $(CFLAGS) bench.obj $(LIBS) ..\common\*.lib /Fe$@ - -clean: - del *.obj *.lib test.exe bench.exe diff --git a/src/tools/Makefile.nmake b/src/tools/Makefile.nmake deleted file mode 100644 index e223d9b135..0000000000 --- a/src/tools/Makefile.nmake +++ /dev/null @@ -1,22 +0,0 @@ -all: tor-resolve.exe tor-gencert.exe tor-print-ed-signing-cert.exe - -CFLAGS = /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common /I ..\or - -LIBS = ..\..\..\build-alpha\lib\libevent.lib \ - ..\..\..\build-alpha\lib\libcrypto.lib \ - ..\..\..\build-alpha\lib\libssl.lib \ - ..\..\..\build-alpha\lib\libz.lib \ - ws2_32.lib advapi32.lib shell32.lib \ - crypt32.lib gdi32.lib user32.lib - -tor-gencert.exe: tor-gencert.obj - $(CC) $(CFLAGS) $(LIBS) ..\common\*.lib tor-gencert.obj - -tor-resolve.exe: tor-resolve.obj - $(CC) $(CFLAGS) $(LIBS) ..\common\*.lib tor-resolve.obj - -tor-print-ed-signing-cert.exe: tor-print-ed-signing-cert.obj - $(CC) $(CFLAGS) $(LIBS) ..\common\*.lib tor-print-ed-signing-cert.obj - -clean: - del *.obj *.lib *.exe diff --git a/src/win32/include.am b/src/win32/include.am deleted file mode 100644 index dad59af3ae..0000000000 --- a/src/win32/include.am +++ /dev/null @@ -1,3 +0,0 @@ - -EXTRA_DIST+= src/win32/orconfig.h - diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h deleted file mode 100644 index d5c0d17ee5..0000000000 --- a/src/win32/orconfig.h +++ /dev/null @@ -1,242 +0,0 @@ -/* orconfig.h for Windows -- This file is *not* generated by autoconf. - * Instead, it has to be hand-edited to keep Win32 happy. - */ - -/* Windows-only defines. */ -#define CONFDIR "" - -/* Define to 1 if you have the <arpa/inet.h> header file. */ -#undef HAVE_ARPA_INET_H - -/* Define to 1 if you have the <assert.h> header file. */ -#define HAVE_ASSERT_H - -/* Define to 1 if you have the <ctype.h> header file. */ -#define HAVE_CTYPE_H - -/* Define to 1 if you have the <errno.h> header file. */ -#define HAVE_ERRNO_H - -/* Define to 1 if you have the <fcntl.h> header file. */ -#define HAVE_FCNTL_H - -/* Define to 1 if you have the `ftime' function. */ -#define HAVE_FTIME - -/* Define to 1 if you have the `gettimeofday' function. */ -#undef HAVE_GETTIMEOFDAY - -/* Define to 1 if you have the <grp.h> header file. */ -#undef HAVE_GRP_H - -/* Define to 1 if you have the `inet_aton' function. */ -#undef HAVE_INET_ATON - -/* Define to 1 if you have the <inttypes.h> header file. */ -/* #define HAVE_INTTYPES_H */ - -/* Define to 1 if you have the <limits.h> header file. */ -#define HAVE_LIMITS_H - -/* Define to 1 if you have the <machine/limits.h> header file. */ -#undef HAVE_MACHINE_LIMITS_H - -/* Define to 1 if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H - -/* Define to 1 if you have the <netdb.h> header file. */ -#undef HAVE_NETDB_H - -/* Define to 1 if you have the <netinet/in.h> header file. */ -#undef HAVE_NETINET_IN_H - -/* Define to 1 if you have the <poll.h> header file. */ -#undef HAVE_POLL_H - -/* Define to 1 if you have the <pwd.h> header file. */ -#undef HAVE_PWD_H - -/* Define to 1 if you have the <signal.h> header file. */ -#define HAVE_SIGNAL_H - -/* Define to 1 if you have the `socketpair' function. */ -#undef HAVE_SOCKETPAIR - -/* Define to 1 if you have the <stdint.h> header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H - -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#define HAVE_STRING_H - -/* Define to 1 if you have the `strlcat' function. */ -#undef HAVE_STRLCAT - -/* Define to 1 if you have the `strlcpy' function. */ -#undef HAVE_STRLCPY - -/* Define to 1 if you have the `strptime' function. */ -#undef HAVE_STRPTIME - -/* Define to 1 if your timeval has a tv_sec element. */ -#define HAVE_STRUCT_TIMEVAL_TV_SEC -/* Change to #undef if you're using BCC */ - -/* Define to 1 if you have the <sys/fcntl.h> header file. */ -#undef HAVE_SYS_FCNTL_H - -/* Define to 1 if you have the <sys/ioctl.h> header file. */ -#undef HAVE_SYS_IOCTL_H - -/* Define to 1 if you have the <sys/limits.h> header file. */ -#undef HAVE_SYS_LIMITS_H - -/* Define to 1 if you have the <sys/poll.h> header file. */ -#undef HAVE_SYS_POLL_H - -/* Define to 1 if you have the <sys/socket.h> header file. */ -#undef HAVE_SYS_SOCKET_H - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H - -/* Define to 1 if you have the <sys/time.h> header file. */ -#undef HAVE_SYS_TIME_H - -/* Define to 1 if you have the <sys/types.h> header file. */ -#define HAVE_SYS_TYPES_H - -/* Define to 1 if you have the <sys/utime.h> header file. */ -#define HAVE_SYS_UTIME_H - -/* Define to 1 if you have the <sys/wait.h> header file. */ -#undef HAVE_SYS_WAIT_H - -/* Define to 1 if you have the <time.h> header file. */ -#define HAVE_TIME_H - -/* Define to 1 if you have the `uname' function. */ -#undef HAVE_UNAME - -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the `_vscprintf' function. */ -#define HAVE__VSCPRINTF 1 - -/* Define to 1 iff NULL is represented by a 0 in memory. */ -#define NULL_REP_IS_ZERO_BYTES 1 - -/* Define to 1 iff memset(0) sets doubles to 0.0 */ -#define DOUBLE_0_REP_IS_ZERO_BYTES 1 - -/* Name of package */ -#define PACKAGE "tor" - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* The size of a `char', as computed by sizeof. */ -#define SIZEOF_CHAR 1 - -/* The size of a `int', as computed by sizeof. */ -#define SIZEOF_INT 4 - -/* The size of a `int16_t', as computed by sizeof. */ -#undef SIZEOF_INT16_T - -/* The size of a `int32_t', as computed by sizeof. */ -#undef SIZEOF_INT32_T - -/* The size of a `int64_t', as computed by sizeof. */ -#undef SIZEOF_INT64_T - -/* The size of a `int8_t', as computed by sizeof. */ -#undef SIZEOF_INT8_T - -/* The size of a `long', as computed by sizeof. */ -#define SIZEOF_LONG 4 - -/* The size of a `long long', as computed by sizeof. */ -#undef SIZEOF_LONG_LONG - -/* The size of `pid_t', as computed by sizeof. */ -#define SIZEOF_PID_T 0 - -/* The size of a `short', as computed by sizeof. */ -#define SIZEOF_SHORT 2 - -/* The size of a `time_t', as computed by sizeof. */ -#define SIZEOF_TIME_T 4 - -/* The size of a `uint16_t', as computed by sizeof. */ -#undef SIZEOF_UINT16_T - -/* The size of a `uint32_t', as computed by sizeof. */ -#undef SIZEOF_UINT32_T - -/* The size of a `uint64_t', as computed by sizeof. */ -#undef SIZEOF_UINT64_T - -/* The size of a `uint8_t', as computed by sizeof. */ -#undef SIZEOF_UINT8_T - -/* The size of a `void *', as computed by sizeof. */ -#define SIZEOF_VOID_P 4 - -/* The size of a `__int64', as computed by sizeof. */ -#define SIZEOF___INT64 8 - -/* The sizeof a size_t, as computed by sizeof. */ -#define SIZEOF_SIZE_T 4 - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS - -/* Define to 1 iff unaligned int access is allowed */ -#define UNALIGNED_INT_ACCESS_OK - -/* Define to 1 iff we represent negative integers with two's complement */ -#define USING_TWOS_COMPLEMENT - -/* Version number of package */ -#define VERSION "0.4.8.0-alpha-dev" - -#define HAVE_STRUCT_SOCKADDR_IN6 -#define HAVE_STRUCT_IN6_ADDR -#define RSHIFT_DOES_SIGN_EXTEND -#define FLEXIBLE_ARRAY_MEMBER 0 -#define SHARE_DATADIR "" -#define USE_CURVE25519_DONNA - -#define ENUM_VALS_ARE_SIGNED 1 - -#ifndef STDOUT_FILENO -#define STDOUT_FILENO 1 -#endif - -#ifndef STDERR_FILENO -#define STDERR_FILENO 2 -#endif - -#define WINVER 0x0501 -#define _WIN32_WINNT 0x0501 -#define WIN32_LEAN_AND_MEAN 1 - -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated (87b2ce6f84 -> 62f505efd8)
by gitolite role 24 May '22

24 May '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository tor. from 87b2ce6f84 Trigger OOS on bind failures (fixes #40597) new 71b68f32eb Remove fallback-consensus rule new d18b118bcc Merge branch 'tor-gitlab/mr/568' new 160bf44c9b doc: fix out-of-tree build from git new 62f505efd8 Merge branch 'tor-gitlab/mr/566' The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: doc/asciidoc-helper.sh | 2 +- src/config/include.am | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 4

[pluggable-transports/snowflake] branch main updated: Bump version of pion/webrtc to v3.1.41
by gitolite role 24 May '22

24 May '22

This is an automated email from the git hooks/post-receive script. cohosh pushed a commit to branch main in repository pluggable-transports/snowflake. The following commit(s) were added to refs/heads/main by this push: new dd83b68 Bump version of pion/webrtc to v3.1.41 dd83b68 is described below commit dd83b68efa63144a80bd81b9c2a550a1825fa464 Author: Cecylia Bocovich <cohosh(a)torproject.org> AuthorDate: Tue May 24 11:39:47 2022 -0400 Bump version of pion/webrtc to v3.1.41 This bumps the version of pion/dtls to v2.1.5 to fix three CVEs: - https://cve.mitre.org/cgi-bin/cvename.cgi?name=2022-29189 - https://cve.mitre.org/cgi-bin/cvename.cgi?name=2022-29190 - https://cve.mitre.org/cgi-bin/cvename.cgi?name=2022-29222 --- go.mod | 10 +++++----- go.sum | 37 +++++++++++++++++++------------------ 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/go.mod b/go.mod index 2afb03b..842648c 100644 --- a/go.mod +++ b/go.mod @@ -5,10 +5,10 @@ go 1.13 require ( git.torproject.org/pluggable-transports/goptlib.git v1.1.0 github.com/gorilla/websocket v1.4.1 - github.com/pion/ice/v2 v2.2.3 - github.com/pion/sdp/v3 v3.0.4 + github.com/pion/ice/v2 v2.2.6 + github.com/pion/sdp/v3 v3.0.5 github.com/pion/stun v0.3.5 - github.com/pion/webrtc/v3 v3.1.28 + github.com/pion/webrtc/v3 v3.1.41 github.com/prometheus/client_golang v1.10.0 github.com/prometheus/client_model v0.2.0 github.com/refraction-networking/utls v1.0.0 @@ -17,7 +17,7 @@ require ( github.com/xtaci/kcp-go/v5 v5.6.1 github.com/xtaci/smux v1.5.15 gitlab.torproject.org/tpo/anti-censorship/geoip v0.0.0-20210928150955-7ce4b3d98d01 - golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 - golang.org/x/net v0.0.0-20220401154927-543a649e0bdd + golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 + golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 google.golang.org/protobuf v1.26.0 ) diff --git a/go.sum b/go.sum index 68c19b7..2c6f232 100644 --- a/go.sum +++ b/go.sum @@ -228,32 +228,30 @@ github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E= github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ= -github.com/pion/dtls/v2 v2.1.3 h1:3UF7udADqous+M2R5Uo2q/YaP4EzUoWKdfX2oscCUio= github.com/pion/dtls/v2 v2.1.3/go.mod h1:o6+WvyLDAlXF7YiPB/RlskRoeK+/JtuaZa5emwQcWus= -github.com/pion/ice/v2 v2.2.3 h1:kBVhmtMcI1L3bWDepilO9kKpCGpLQeppCuVxVS8obhE= -github.com/pion/ice/v2 v2.2.3/go.mod h1:SWuHiOGP17lGromHTFadUe1EuPgFh/oCU6FCMZHooVE= -github.com/pion/interceptor v0.1.10 h1:DJ2GjMGm4XGIQgMJxuEpdaExdY/6RdngT7Uh4oVmquU= -github.com/pion/interceptor v0.1.10/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U= +github.com/pion/dtls/v2 v2.1.5 h1:jlh2vtIyUBShchoTDqpCCqiYCyRFJ/lvf/gQ8TALs+c= +github.com/pion/dtls/v2 v2.1.5/go.mod h1:BqCE7xPZbPSubGasRoDFJeTsyJtdD1FanJYL0JGheqY= +github.com/pion/ice/v2 v2.2.6 h1:R/vaLlI1J2gCx141L5PEwtuGAGcyS6e7E0hDeJFq5Ig= +github.com/pion/ice/v2 v2.2.6/go.mod h1:SWuHiOGP17lGromHTFadUe1EuPgFh/oCU6FCMZHooVE= +github.com/pion/interceptor v0.1.11 h1:00U6OlqxA3FFB50HSg25J/8cWi7P6FbSzw4eFn24Bvs= +github.com/pion/interceptor v0.1.11/go.mod h1:tbtKjZY14awXd7Bq0mmWvgtHB5MDaRN7HV3OZ/uy7s8= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms= github.com/pion/mdns v0.0.5 h1:Q2oj/JB3NqfzY9xGZ1fPzZzK7sDSD8rZPOvcIQ10BCw= github.com/pion/mdns v0.0.5/go.mod h1:UgssrvdD3mxpi8tMxAXbsppL3vJ4Jipw1mTCW+al01g= github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA= github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8= -github.com/pion/rtcp v1.2.6/go.mod h1:52rMNPWFsjr39z9B9MhnkqhPLoeHTv1aN63o/42bWE0= github.com/pion/rtcp v1.2.9 h1:1ujStwg++IOLIEoOiIQ2s+qBuJ1VN81KW+9pMPsif+U= github.com/pion/rtcp v1.2.9/go.mod h1:qVPhiCzAm4D/rxb6XzKeyZiQK69yJpbUDJSF7TgrqNo= -github.com/pion/rtp v1.7.0/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= -github.com/pion/rtp v1.7.4/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= -github.com/pion/rtp v1.7.12 h1:Wtrx1btLYn96vQGx35UTpgRBG/MGJmIHvrGND1m219A= -github.com/pion/rtp v1.7.12/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= +github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA= +github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko= github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= github.com/pion/sctp v1.8.2 h1:yBBCIrUMJ4yFICL3RIvR4eh/H2BTTvlligmSTy+3kiA= github.com/pion/sctp v1.8.2/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s= -github.com/pion/sdp/v3 v3.0.4 h1:2Kf+dgrzJflNCSw3TV5v2VLeI0s/qkzy2r5jlR0wzf8= -github.com/pion/sdp/v3 v3.0.4/go.mod h1:bNiSknmJE0HYBprTHXKPQ3+JjacTv5uap92ueJZKsRk= -github.com/pion/srtp/v2 v2.0.5 h1:ks3wcTvIUE/GHndO3FAvROQ9opy0uLELpwHJaQ1yqhQ= -github.com/pion/srtp/v2 v2.0.5/go.mod h1:8k6AJlal740mrZ6WYxc4Dg6qDqqhxoRG2GSjlUhDF0A= +github.com/pion/sdp/v3 v3.0.5 h1:ouvI7IgGl+V4CrqskVtr3AaTrPvPisEOxwgpdktctkU= +github.com/pion/sdp/v3 v3.0.5/go.mod h1:iiFWFpQO8Fy3S5ldclBkpXqmWy02ns78NOKoLLL0YQw= +github.com/pion/srtp/v2 v2.0.9 h1:JJq3jClmDFBPX/F5roEb0U19jSU7eUhyDqR/NZ34EKQ= +github.com/pion/srtp/v2 v2.0.9/go.mod h1:5TtM9yw6lsH0ppNCehB/EjEUli7VkUgKSPJqWVqbhQ4= github.com/pion/stun v0.3.5 h1:uLUCBCkQby4S1cf6CGuR9QrVOKcvUwFeemaC865QHDg= github.com/pion/stun v0.3.5/go.mod h1:gDMim+47EeEtfWogA37n6qXZS88L5V6LqFcf+DZA2UA= github.com/pion/transport v0.12.2/go.mod h1:N3+vZQD9HlDP5GWkZ85LohxNsDcNgofQmyL6ojX5d8Q= @@ -264,8 +262,8 @@ github.com/pion/turn/v2 v2.0.8 h1:KEstL92OUN3k5k8qxsXHpr7WWfrdp7iJZHx99ud8muw= github.com/pion/turn/v2 v2.0.8/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw= github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M= -github.com/pion/webrtc/v3 v3.1.28 h1:cNUENLrHmY3PWO9na3RGrhnSjzPLQyXRVRDREC7a5Ug= -github.com/pion/webrtc/v3 v3.1.28/go.mod h1:MKhUmhMsy0NZuLpZkEvTg7tcn9HBHZO39Mh2+VDj67g= +github.com/pion/webrtc/v3 v3.1.41 h1:QogLjtriu+OwerRp4r6emTg4+zDWUy5R6EqthDBy7c0= +github.com/pion/webrtc/v3 v3.1.41/go.mod h1:sUcW9SFPEWerDqGOBmdYEMfRvbdd7rgwo4bNzfsXww4= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -380,8 +378,10 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 h1:71vQrMauZZhcTVK6KdYM+rklehEEwb3E+ZhaE5jrPrE= golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8 h1:y+mHpWoQJNAHt26Nhh6JP7hvM71IRZureyvZhoVALIs= +golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -420,8 +420,9 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220401154927-543a649e0bdd h1:zYlwaUHTmxuf6H7hwO2dgwqozQmH7zf4x+/qql4oVWc= golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 h1:HVyaeDAYux4pnY+D/SiwmLOR36ewZ4iGQIIrtnuCjFA= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated: Bug 40486: Prepare alpha release 11.5a12 (Desktop+Android)
by gitolite role 24 May '22

24 May '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch master in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/master by this push: new 28d9ff2 Bug 40486: Prepare alpha release 11.5a12 (Desktop+Android) 28d9ff2 is described below commit 28d9ff24466a149adf972152de565e855eb0023c Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Sat May 21 19:50:53 2022 +0000 Bug 40486: Prepare alpha release 11.5a12 (Desktop+Android) --- projects/fenix/config | 2 +- projects/firefox/config | 2 +- projects/geckoview/config | 2 +- projects/go/config | 8 ++++---- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 18 ++++++++++++++++++ rbm.conf | 6 +++--- 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/projects/fenix/config b/projects/fenix/config index 2b14ad7..f193de4 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1-build3' git_url: https://gitlab.torproject.org/tpo/applications/fenix.git tag_gpg_id: 1 gpg_keyring: torbutton.gpg diff --git a/projects/firefox/config b/projects/firefox/config index 487e22b..cfdec18 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build4' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/geckoview/config b/projects/geckoview/config index 78de552..8255944 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-2-build2' +git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-2-build4' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/go/config b/projects/go/config index 54f41ab..e58119c 100644 --- a/projects/go/config +++ b/projects/go/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.17.9 +version: 1.17.10 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: @@ -96,7 +96,7 @@ targets: var: GOARCH: 386 android: - version: 1.18.1 + version: 1.18.2 var: GOOS: android android-x86: @@ -120,11 +120,11 @@ input_files: - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' enable: '[% ! c("var/android") %]' name: go - sha256sum: 763ad4bafb80a9204458c5fa2b8e7327fa971aee454252c0e362c11236156813 + sha256sum: 299e55af30f15691b015d8dcf8ecae72412412569e5b2ece20361753a456f2f9 - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz' enable: '[% c("var/android") %]' name: go - sha256sum: efd43e0f1402e083b73a03d444b7b6576bb4c539ac46208b63a916b69aca4088 + sha256sum: 2c44d03ea2c34092137ab919ba602f2c261a038d08eb468528a3f3a28e5667e2 - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz' name: go14 sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9adf478..a8e7a11 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,21 @@ +Tor Browser 11.5a12 - May 21 2022 + * Windows + OS X + Linux + * Bug 40309: Avoid using regional OS locales [tor-browser] + * Bug 40912: Hide screenshots menu since we don't support it [tor-browser] + * Bug 40916: Remove the browser.download.panel.shown preference [tor-browser] + * Bug 40918: In 11.5a11 the breadcrumbs are visible on the first bootstrap [tor-browser] + * Bug 40923: Consume country code to improve error report [tor-browser] + * All Platforms + * Bug 40967: Integrate Mozilla fix for Bug 1770137 [tor-browser] + * Bug 40968: Integrate Mozilla fix for Bug 1770048 [tor-browser] + * Build System + * All Platforms + * Bug 40476: Add tools/signing/do-all-signing script, and other signing scripts improvements [tor-browser-build] + * Android + * Update Go to 1.18.2 + * Windows + OS X + Linux + * Update Go to 1.17.10 + Tor Browser 11.5a11 - May 4 2022 * Windows + OS X + Linux * Update Firefox to 91.9.0esr diff --git a/rbm.conf b/rbm.conf index 4e23b77..3786629 100644 --- a/rbm.conf +++ b/rbm.conf @@ -66,10 +66,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '11.5a11' - torbrowser_build: 'build2' + torbrowser_version: '11.5a12' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 11.5a9 + - 11.5a11 project_name: tor-browser multi_lingual: 0 build_mar: 1 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated: Trigger OOS on bind failures (fixes #40597)
by gitolite role 24 May '22

24 May '22

This is an automated email from the git hooks/post-receive script. nickm pushed a commit to branch main in repository tor. The following commit(s) were added to refs/heads/main by this push: new 87b2ce6f84 Trigger OOS on bind failures (fixes #40597) 87b2ce6f84 is described below commit 87b2ce6f848ec3a65a7a06ef1edce5a0652ad9a3 Author: Alex Xu (Hello71) <alex_y_xu(a)yahoo.ca> AuthorDate: Sat May 21 15:52:31 2022 -0400 Trigger OOS on bind failures (fixes #40597) --- changes/issue40597 | 4 ++++ src/core/mainloop/connection.c | 24 +++++++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/changes/issue40597 b/changes/issue40597 new file mode 100644 index 0000000000..db2220805e --- /dev/null +++ b/changes/issue40597 @@ -0,0 +1,4 @@ + o Minor features (relays): + - Trigger OOS when bind fails with EADDRINUSE. This improves fairness when + a large number of exit connections are requested, and properly signals + exhaustion to the network. Fixes issue 40597; patch by Alex Xu (Hello71). diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 9271a70914..75fc3c8918 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -2224,21 +2224,27 @@ connection_connect_sockaddr,(connection_t *conn, tor_socket_strerror(errno)); } - /* - * We've got the socket open; give the OOS handler a chance to check - * against configured maximum socket number, but tell it no exhaustion - * failure. - */ - connection_check_oos(get_n_open_sockets(), 0); - if (bindaddr && bind(s, bindaddr, bindaddr_len) < 0) { *socket_error = tor_socket_errno(s); - log_warn(LD_NET,"Error binding network socket: %s", - tor_socket_strerror(*socket_error)); + if (ERRNO_IS_EADDRINUSE(*socket_error)) { + socket_failed_from_resource_exhaustion(); + connection_check_oos(get_n_open_sockets(), 1); + } else { + log_warn(LD_NET,"Error binding network socket: %s", + tor_socket_strerror(*socket_error)); + connection_check_oos(get_n_open_sockets(), 0); + } tor_close_socket(s); return -1; } + /* + * We've got the socket open and bound; give the OOS handler a chance to + * check against configured maximum socket number, but tell it no exhaustion + * failure. + */ + connection_check_oos(get_n_open_sockets(), 0); + tor_assert(options); if (options->ConstrainedSockets) set_constrained_socket_buffers(s, (int)options->ConstrainedSockSize); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch maint-11.0 updated: Fix typo in ChangeLog.txt
by gitolite role 23 May '22

23 May '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch maint-11.0 in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/maint-11.0 by this push: new e4e9282 Fix typo in ChangeLog.txt e4e9282 is described below commit e4e9282ea47b50ace160f309de1d6e236d4328db Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Mon May 23 12:39:01 2022 +0200 Fix typo in ChangeLog.txt --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index c297a54..13f570f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -4,7 +4,7 @@ Tor Browser 11.0.13 - May 20 2022 * All Platforms * Update Tor to 0.4.7.7 * Bug 40967: Integrate Mozilla fix for Bug 1770137 [tor-browser] - * Bug 40968: Integrate Mozilla fix fo rBug 1770048 [tor-browser] + * Bug 40968: Integrate Mozilla fix for Bug 1770048 [tor-browser] * Build System * All Platforms * Update Go to 1.17.10 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] annotated tag geckoview-99.0b3-11.5-2-build4 created (now 80bf4201798ef)
by gitolite role 23 May '22

23 May '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to annotated tag geckoview-99.0b3-11.5-2-build4 in repository tor-browser. at 80bf4201798ef (tag) tagging 9f1fba5c0a9cfd9768e8793499080fe9566a5f0c (commit) replaces geckoview-99.0b3-11.5-2-build3 by Pier Angelo Vendrame on Mon May 23 10:26:43 2022 +0200 - Log ----------------------------------------------------------------- Tagging build4 for 99.0b3-based alpha -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQCHOE9KLO2f598e8HwdW0XkBKIkQUCYotFUQAKCRDwdW0XkBKI kaOfAP4pLisnS8ZhkNx7BhkNYQKX5wDXqMW2gLjWdo/fnuGlxQEAnAiKTAj5zM66 jb25VsWwBKmWkPyGF+IWBMGctjF7qgc= =6gPr -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch geckoview-99.0b3-11.5-2 updated (2fbebf5fc3278 -> 9f1fba5c0a9cf)
by gitolite role 23 May '22

23 May '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch geckoview-99.0b3-11.5-2 in repository tor-browser. from 2fbebf5fc3278 squash! TB4: Tor Browser's Firefox preference overrides. new d9fce6f68ea35 Bug 1770137 - Make notification code use Object.create. r=Gijs,freddyb new 0c25bf48cee7a Bug 1770137 - Part 2, r=Gijs new 9f1fba5c0a9cf Bug 1770048: Improve self-hosted new_List r=jandem,tcampbell,a=dsmith The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: dom/notification/old/NotificationDB.jsm | 19 ++++++++++--------- js/src/builtin/Array.cpp | 19 +++++++++++++++++++ js/src/builtin/Array.h | 2 ++ js/src/builtin/Module.js | 16 ++++++++-------- js/src/builtin/RegExp.js | 6 +++--- js/src/builtin/Utilities.js | 11 +---------- js/src/vm/SelfHosting.cpp | 1 + 7 files changed, 44 insertions(+), 30 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3