July 2020 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.4.4'
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit 9164d7c75e6191828db15ac713843932867158ef Merge: 75f94ea1ec 0c8c295963 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 29 12:37:08 2020 -0400 Merge branch 'maint-0.4.4' changes/bug40072 | 4 ++++ src/app/main/main.c | 8 ++++++-- src/lib/sandbox/sandbox.c | 10 +--------- 3 files changed, 11 insertions(+), 11 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit 0c8c295963b5389684d3b41e9260f7fbba4dfe2a Merge: c7502b6503 3b8bf743ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 29 12:37:08 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit 50f5f0001c386c3e98ffb9bee72d00719039c0e1 Merge: 09c35dcf03 dcc60294ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 29 12:37:07 2020 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug31036 | 3 +++ src/lib/fdio/fdio.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.5] Use _lseeki64() on windows.
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit dcc60294ad4fe349003d6aeea774d8652744358a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 28 11:30:47 2020 -0400 Use _lseeki64() on windows. Fixes bug 31036; bugfix on 0.2.1.8-alpha when we moved the logging system to use posix fds. --- changes/bug31036 | 3 +++ src/lib/fdio/fdio.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changes/bug31036 b/changes/bug31036 new file mode 100644 index 0000000000..d9921dba43 --- /dev/null +++ b/changes/bug31036 @@ -0,0 +1,3 @@ + o Minor bugfixes (windows): + - Fix a bug that prevented Tor from starting if its log file + grew above 2GB. Fixes bug 31036; bugfix on 0.2.1.8-alpha. diff --git a/src/lib/fdio/fdio.c b/src/lib/fdio/fdio.c index 6c87af791d..d723d04d2a 100644 --- a/src/lib/fdio/fdio.c +++ b/src/lib/fdio/fdio.c @@ -43,7 +43,7 @@ off_t tor_fd_getpos(int fd) { #ifdef _WIN32 - return (off_t) _lseek(fd, 0, SEEK_CUR); + return (off_t) _lseeki64(fd, 0, SEEK_CUR); #else return (off_t) lseek(fd, 0, SEEK_CUR); #endif @@ -56,7 +56,7 @@ int tor_fd_seekend(int fd) { #ifdef _WIN32 - return _lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; + return _lseeki64(fd, 0, SEEK_END) < 0 ? -1 : 0; #else off_t rc = lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; #ifdef ESPIPE @@ -75,7 +75,7 @@ int tor_fd_setpos(int fd, off_t pos) { #ifdef _WIN32 - return _lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0; + return _lseeki64(fd, pos, SEEK_SET) < 0 ? -1 : 0; #else return lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0; #endif

1 0

[tor/release-0.4.2] Use _lseeki64() on windows.
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit dcc60294ad4fe349003d6aeea774d8652744358a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 28 11:30:47 2020 -0400 Use _lseeki64() on windows. Fixes bug 31036; bugfix on 0.2.1.8-alpha when we moved the logging system to use posix fds. --- changes/bug31036 | 3 +++ src/lib/fdio/fdio.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changes/bug31036 b/changes/bug31036 new file mode 100644 index 0000000000..d9921dba43 --- /dev/null +++ b/changes/bug31036 @@ -0,0 +1,3 @@ + o Minor bugfixes (windows): + - Fix a bug that prevented Tor from starting if its log file + grew above 2GB. Fixes bug 31036; bugfix on 0.2.1.8-alpha. diff --git a/src/lib/fdio/fdio.c b/src/lib/fdio/fdio.c index 6c87af791d..d723d04d2a 100644 --- a/src/lib/fdio/fdio.c +++ b/src/lib/fdio/fdio.c @@ -43,7 +43,7 @@ off_t tor_fd_getpos(int fd) { #ifdef _WIN32 - return (off_t) _lseek(fd, 0, SEEK_CUR); + return (off_t) _lseeki64(fd, 0, SEEK_CUR); #else return (off_t) lseek(fd, 0, SEEK_CUR); #endif @@ -56,7 +56,7 @@ int tor_fd_seekend(int fd) { #ifdef _WIN32 - return _lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; + return _lseeki64(fd, 0, SEEK_END) < 0 ? -1 : 0; #else off_t rc = lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; #ifdef ESPIPE @@ -75,7 +75,7 @@ int tor_fd_setpos(int fd, off_t pos) { #ifdef _WIN32 - return _lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0; + return _lseeki64(fd, pos, SEEK_SET) < 0 ? -1 : 0; #else return lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0; #endif

1 0

[tor/master] Remove duplicate #include control_events.h in control_cmd.c
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit 54d9e1b91f7ed2ea3bbe527de17478e8f05fa745 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed Jul 8 21:42:44 2020 -0700 Remove duplicate #include control_events.h in control_cmd.c --- src/feature/control/control_cmd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index a8926c0b79..301a4872b6 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -25,7 +25,6 @@ #include "feature/client/addressmap.h" #include "feature/client/dnsserv.h" #include "feature/client/entrynodes.h" -#include "feature/control/control_events.h" #include "feature/control/control.h" #include "feature/control/control_auth.h" #include "feature/control/control_cmd.h"

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1987/head'
by nickm＠torproject.org 29 Jul '20

29 Jul '20

commit 75f94ea1ec72df18d0f4435ee110bd667c9a142f Merge: eba2870d18 54d9e1b91f Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 29 10:58:47 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1987/head' src/feature/control/control_cmd.c | 1 - 1 file changed, 1 deletion(-)

1 0

[tor/maint-0.4.4] Use _lseeki64() on windows.
by ahf＠torproject.org 29 Jul '20

29 Jul '20

commit dcc60294ad4fe349003d6aeea774d8652744358a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 28 11:30:47 2020 -0400 Use _lseeki64() on windows. Fixes bug 31036; bugfix on 0.2.1.8-alpha when we moved the logging system to use posix fds. --- changes/bug31036 | 3 +++ src/lib/fdio/fdio.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changes/bug31036 b/changes/bug31036 new file mode 100644 index 0000000000..d9921dba43 --- /dev/null +++ b/changes/bug31036 @@ -0,0 +1,3 @@ + o Minor bugfixes (windows): + - Fix a bug that prevented Tor from starting if its log file + grew above 2GB. Fixes bug 31036; bugfix on 0.2.1.8-alpha. diff --git a/src/lib/fdio/fdio.c b/src/lib/fdio/fdio.c index 6c87af791d..d723d04d2a 100644 --- a/src/lib/fdio/fdio.c +++ b/src/lib/fdio/fdio.c @@ -43,7 +43,7 @@ off_t tor_fd_getpos(int fd) { #ifdef _WIN32 - return (off_t) _lseek(fd, 0, SEEK_CUR); + return (off_t) _lseeki64(fd, 0, SEEK_CUR); #else return (off_t) lseek(fd, 0, SEEK_CUR); #endif @@ -56,7 +56,7 @@ int tor_fd_seekend(int fd) { #ifdef _WIN32 - return _lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; + return _lseeki64(fd, 0, SEEK_END) < 0 ? -1 : 0; #else off_t rc = lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; #ifdef ESPIPE @@ -75,7 +75,7 @@ int tor_fd_setpos(int fd, off_t pos) { #ifdef _WIN32 - return _lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0; + return _lseeki64(fd, pos, SEEK_SET) < 0 ? -1 : 0; #else return lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0; #endif

1 0

[tor/master] Use _lseeki64() on windows.
by ahf＠torproject.org 29 Jul '20

29 Jul '20

commit dcc60294ad4fe349003d6aeea774d8652744358a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 28 11:30:47 2020 -0400 Use _lseeki64() on windows. Fixes bug 31036; bugfix on 0.2.1.8-alpha when we moved the logging system to use posix fds. --- changes/bug31036 | 3 +++ src/lib/fdio/fdio.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/changes/bug31036 b/changes/bug31036 new file mode 100644 index 0000000000..d9921dba43 --- /dev/null +++ b/changes/bug31036 @@ -0,0 +1,3 @@ + o Minor bugfixes (windows): + - Fix a bug that prevented Tor from starting if its log file + grew above 2GB. Fixes bug 31036; bugfix on 0.2.1.8-alpha. diff --git a/src/lib/fdio/fdio.c b/src/lib/fdio/fdio.c index 6c87af791d..d723d04d2a 100644 --- a/src/lib/fdio/fdio.c +++ b/src/lib/fdio/fdio.c @@ -43,7 +43,7 @@ off_t tor_fd_getpos(int fd) { #ifdef _WIN32 - return (off_t) _lseek(fd, 0, SEEK_CUR); + return (off_t) _lseeki64(fd, 0, SEEK_CUR); #else return (off_t) lseek(fd, 0, SEEK_CUR); #endif @@ -56,7 +56,7 @@ int tor_fd_seekend(int fd) { #ifdef _WIN32 - return _lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; + return _lseeki64(fd, 0, SEEK_END) < 0 ? -1 : 0; #else off_t rc = lseek(fd, 0, SEEK_END) < 0 ? -1 : 0; #ifdef ESPIPE @@ -75,7 +75,7 @@ int tor_fd_setpos(int fd, off_t pos) { #ifdef _WIN32 - return _lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0; + return _lseeki64(fd, pos, SEEK_SET) < 0 ? -1 : 0; #else return lseek(fd, pos, SEEK_SET) < 0 ? -1 : 0; #endif

1 0

[tor/maint-0.4.4] Merge remote-tracking branch 'tor-gitlab/mr/85' into maint-0.4.4
by ahf＠torproject.org 29 Jul '20

29 Jul '20

commit 8e690ce736b3c61a1f007df4a1cd542e97e602c5 Merge: 0a38e02fb3 dcc60294ad Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Jul 29 13:57:47 2020 +0000 Merge remote-tracking branch 'tor-gitlab/mr/85' into maint-0.4.4 changes/bug31036 | 3 +++ src/lib/fdio/fdio.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)

1 0