]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
4 years agoOn Android, get_data_directory() should not use LOCALSTATEDIR
Hans-Christoph Steiner [Fri, 15 Oct 2021 08:18:31 +0000 (10:18 +0200)] 
On Android, get_data_directory() should not use LOCALSTATEDIR

closes https://gitlab.torproject.org/tpo/core/tor/-/issues/40487

4 years agoMerge branch 'maint-0.4.6' into main
Alexander Færøy [Mon, 8 Nov 2021 14:16:19 +0000 (14:16 +0000)] 
Merge branch 'maint-0.4.6' into main

4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
Alexander Færøy [Mon, 8 Nov 2021 14:16:19 +0000 (14:16 +0000)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.5
Alexander Færøy [Mon, 8 Nov 2021 14:16:18 +0000 (14:16 +0000)] 
Merge branch 'maint-0.3.5' into maint-0.4.5

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/487' into maint-0.3.5
Alexander Færøy [Mon, 8 Nov 2021 14:15:59 +0000 (14:15 +0000)] 
Merge remote-tracking branch 'tor-gitlab/mr/487' into maint-0.3.5

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/486' into maint-0.3.5
Alexander Færøy [Mon, 8 Nov 2021 14:15:56 +0000 (14:15 +0000)] 
Merge remote-tracking branch 'tor-gitlab/mr/486' into maint-0.3.5

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/485' into main
Alexander Færøy [Mon, 8 Nov 2021 14:14:03 +0000 (14:14 +0000)] 
Merge remote-tracking branch 'tor-gitlab/mr/485' into main

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/480' into main
Alexander Færøy [Mon, 8 Nov 2021 14:12:22 +0000 (14:12 +0000)] 
Merge remote-tracking branch 'tor-gitlab/mr/480' into main

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/479' into main
Alexander Færøy [Mon, 8 Nov 2021 14:10:29 +0000 (14:10 +0000)] 
Merge remote-tracking branch 'tor-gitlab/mr/479' into main

4 years agoGive an error message if LibreSSL's TLSv1.3 APIs aren't what we need
Nick Mathewson [Sat, 6 Nov 2021 15:04:08 +0000 (11:04 -0400)] 
Give an error message if LibreSSL's TLSv1.3 APIs aren't what we need

From LibreSSL versions 3.2.1 through 3.4.0, our configure script
would conclude that TLSv1.3 as supported, but it actually wasn't.
This led to annoying breakage like #40128 and #40445.

Now we give an error message if we try to build with one of those
versions.

Closes #40511.

4 years agoReverse the direction of the test for openssl 3.0.0
Nick Mathewson [Fri, 5 Nov 2021 17:23:05 +0000 (13:23 -0400)] 
Reverse the direction of the test for openssl 3.0.0

Previously the logic was reversed, and always gave the wrong answer.
This has no other effect than to change whether we suppress
deprecated API warnings.

Fixes #40429; bugfix on 0.3.5.13.

4 years agoPrefer use of __MINGW_PRINTF/SCANF_FORMAT if available.
Nick Mathewson [Fri, 5 Nov 2021 16:08:48 +0000 (12:08 -0400)] 
Prefer use of __MINGW_PRINTF/SCANF_FORMAT if available.

Mingw headers sometimes like to define alternative scanf/printf
format attributes depending on whether they're using clang, UCRT,
MINGW_ANSI_STDIO, or the microsoft version of printf/scanf.  This
change attempts to use the right one on the given platform.

This is an attempt to fix part of #40355.

4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Fri, 5 Nov 2021 14:44:10 +0000 (10:44 -0400)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agoMerge branch 'maint-0.4.6'
David Goulet [Fri, 5 Nov 2021 14:44:10 +0000 (10:44 -0400)] 
Merge branch 'maint-0.4.6'

4 years agoprotover: Fix merge forward from 035
David Goulet [Fri, 5 Nov 2021 14:42:54 +0000 (10:42 -0400)] 
protover: Fix merge forward from 035

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.3.5' into maint-0.4.5
David Goulet [Fri, 5 Nov 2021 14:35:08 +0000 (10:35 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.5

4 years agoLight edit to protover warnings.
Nick Mathewson [Fri, 5 Nov 2021 14:30:57 +0000 (10:30 -0400)] 
Light edit to protover warnings.

4 years agochanges: Add file for ticket 40505
Simon South [Wed, 3 Nov 2021 17:23:04 +0000 (13:23 -0400)] 
changes: Add file for ticket 40505

4 years agosandbox: Allow "statx" syscall on i386 for glibc 2.33
Simon South [Fri, 5 Nov 2021 14:10:10 +0000 (10:10 -0400)] 
sandbox: Allow "statx" syscall on i386 for glibc 2.33

glibc versions 2.33 and newer use the modern "statx" system call in their
implementations of stat() and opendir() for Linux on i386.  Prevent failures in
the sandbox unit tests by modifying the sandbox to allow this system call
without restriction on i386 when it is available, and update the test suite to
skip the "sandbox/stat_filename" test in this case as it is certain to fail.

4 years agotest: Skip sandbox/stat_filename where "stat64" syscall defined
Simon South [Wed, 3 Nov 2021 16:21:35 +0000 (12:21 -0400)] 
test: Skip sandbox/stat_filename where "stat64" syscall defined

On 32-bit architectures where Linux provides the "stat64" system call,
including i386, the sandbox is unable to filter calls to stat() as glibc uses
this system call itself internally and the sandbox must allow it without
restriction.

Update the sandbox unit tests to skip the "sandbox/stat_filename" test on
systems where the "stat64" system call is defined and the test is certain to
fail.  Also reorder the "#if" statement's clauses to correspond with the
comment preceding it, for clarity.

4 years agosandbox: Allow "clock_gettime64" syscall where defined
Simon South [Wed, 3 Nov 2021 15:53:33 +0000 (11:53 -0400)] 
sandbox: Allow "clock_gettime64" syscall where defined

On 32-bit architectures where Linux provides the "clock_gettime64" system call,
including i386, glibc uses it in place of "clock_gettime".  Modify the sandbox
implementation to match, to prevent Tor's monotonic-time functions (in
src/lib/time/compat_time.c) failing when the sandbox is active.

4 years agosandbox: Filter "chown32" syscall on i386
Simon South [Wed, 3 Nov 2021 14:48:16 +0000 (10:48 -0400)] 
sandbox: Filter "chown32" syscall on i386

On i386 glibc uses the "chown32" system call instead of "chown".  Prevent
attempts to filter calls to chown() on this architecture from failing by
modifying the sandbox implementation to match.

4 years agoprotover: Add a note on why LinkAuth is not recommended or required
David Goulet [Fri, 5 Nov 2021 14:16:08 +0000 (10:16 -0400)] 
protover: Add a note on why LinkAuth is not recommended or required

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoprotover: Move all hardcoded lists in one place
David Goulet [Fri, 5 Nov 2021 14:10:24 +0000 (10:10 -0400)] 
protover: Move all hardcoded lists in one place

This also moves the warnings and add some theatrical effect around the
code so anyone modifying those list should notice the warnings signs and
read the comment accordingly.

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoAdd scary warnings about changing the protover list.
Nick Mathewson [Fri, 5 Nov 2021 13:15:10 +0000 (09:15 -0400)] 
Add scary warnings about changing the protover list.

Doing this in the wrong way has potential to cause serious havoc on
the network, so let's make it harder for future programmers to mess
it up.

4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
Alexander Færøy [Fri, 5 Nov 2021 03:10:29 +0000 (03:10 +0000)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agoMerge branch 'maint-0.4.6' into main
Alexander Færøy [Fri, 5 Nov 2021 03:10:29 +0000 (03:10 +0000)] 
Merge branch 'maint-0.4.6' into main

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.5
Alexander Færøy [Fri, 5 Nov 2021 03:10:28 +0000 (03:10 +0000)] 
Merge branch 'maint-0.3.5' into maint-0.4.5

4 years agoMerge remote-tracking branch 'ahf/ahf/ci-i386' into maint-0.3.5
Alexander Færøy [Fri, 5 Nov 2021 03:10:12 +0000 (03:10 +0000)] 
Merge remote-tracking branch 'ahf/ahf/ci-i386' into maint-0.3.5

4 years agoMerge branch 'maint-0.4.6'
David Goulet [Wed, 3 Nov 2021 13:54:14 +0000 (09:54 -0400)] 
Merge branch 'maint-0.4.6'

4 years agoshellcheck: Remove unused variable in ci-driver.sh
David Goulet [Wed, 3 Nov 2021 13:50:43 +0000 (09:50 -0400)] 
shellcheck: Remove unused variable in ci-driver.sh

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.4.6'
David Goulet [Wed, 3 Nov 2021 13:53:35 +0000 (09:53 -0400)] 
Merge branch 'maint-0.4.6'

4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Wed, 3 Nov 2021 13:53:31 +0000 (09:53 -0400)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'tor-gitlab/mr/477' into maint-0.4.5
David Goulet [Wed, 3 Nov 2021 13:52:03 +0000 (09:52 -0400)] 
Merge branch 'tor-gitlab/mr/477' into maint-0.4.5

4 years agorelay: Don't allow DirPort on non-IPv4
David Goulet [Tue, 2 Nov 2021 13:34:03 +0000 (09:34 -0400)] 
relay: Don't allow DirPort on non-IPv4

Our code doesn't allow it and so this prevents an assert() crash if the
DirPort is for instance IPv6 only.

Fixes #40494

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoshellcheck: Remove unused variable in ci-driver.sh
David Goulet [Wed, 3 Nov 2021 13:50:43 +0000 (09:50 -0400)] 
shellcheck: Remove unused variable in ci-driver.sh

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.4.6'
David Goulet [Wed, 3 Nov 2021 13:49:07 +0000 (09:49 -0400)] 
Merge branch 'maint-0.4.6'

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Wed, 3 Nov 2021 13:47:43 +0000 (09:47 -0400)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.5
David Goulet [Wed, 3 Nov 2021 13:47:43 +0000 (09:47 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.5

4 years agoshellcheck: Make it happy on couple scripts
David Goulet [Wed, 3 Nov 2021 13:47:30 +0000 (09:47 -0400)] 
shellcheck: Make it happy on couple scripts

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoAdd i386 version of debian-minimal for 32-bit Gitlab CI builds.
Alexander Færøy [Wed, 3 Nov 2021 12:36:30 +0000 (12:36 +0000)] 
Add i386 version of debian-minimal for 32-bit Gitlab CI builds.

See: tpo/core/tor#40505

4 years agodoc: Brand new ReleasingTor.md
David Goulet [Tue, 2 Nov 2021 15:56:50 +0000 (11:56 -0400)] 
doc: Brand new ReleasingTor.md

Closes #40508

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge remote-tracking branch 'tor-gitlab/mr/474' into main
Alexander Færøy [Tue, 2 Nov 2021 15:28:56 +0000 (15:28 +0000)] 
Merge remote-tracking branch 'tor-gitlab/mr/474' into main

4 years agoMerge branch 'maint-0.4.6' into main
Alexander Færøy [Tue, 2 Nov 2021 15:27:08 +0000 (15:27 +0000)] 
Merge branch 'maint-0.4.6' into main

4 years agoAdd missing ponctuation.
Alexander Færøy [Tue, 2 Nov 2021 15:26:09 +0000 (15:26 +0000)] 
Add missing ponctuation.

4 years agoman: Missing OverloadStatistics option in tor.1
David Goulet [Tue, 2 Nov 2021 13:50:18 +0000 (09:50 -0400)] 
man: Missing OverloadStatistics option in tor.1

Closes #40504

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoreadme: CI Pipeline status icon at the top
David Goulet [Mon, 1 Nov 2021 19:29:59 +0000 (15:29 -0400)] 
readme: CI Pipeline status icon at the top

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoUse TOR_PRIuSZ instead of %ld for CC logging.
Alexander Færøy [Fri, 29 Oct 2021 19:08:20 +0000 (19:08 +0000)] 
Use TOR_PRIuSZ instead of %ld for CC logging.

This patch fixes the current build of main on Windows.

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.5
Alexander Færøy [Fri, 29 Oct 2021 16:56:33 +0000 (16:56 +0000)] 
Merge branch 'maint-0.3.5' into maint-0.4.5

4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
Alexander Færøy [Fri, 29 Oct 2021 16:56:33 +0000 (16:56 +0000)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agoMerge branch 'maint-0.4.6' into main
Alexander Færøy [Fri, 29 Oct 2021 16:56:33 +0000 (16:56 +0000)] 
Merge branch 'maint-0.4.6' into main

4 years agoFix Windows build.
Alexander Færøy [Fri, 5 Feb 2021 17:12:52 +0000 (17:12 +0000)] 
Fix Windows build.

While trying to resolve our CI issues, the Windows build broke with an
unused function error:

   src/test/test_switch_id.c:37:1: error: ‘unprivileged_port_range_start’
   defined but not used [-Werror=unused-function]

We solve this by moving the `#if !defined(_WIN32)` test above the
`unprivileged_port_range_start()` function defintion such that it is
included in its body.

This is an unreviewed commit.

See: tor#40275

4 years agoMerge branch 'maint-0.4.6'
David Goulet [Fri, 29 Oct 2021 13:20:44 +0000 (09:20 -0400)] 
Merge branch 'maint-0.4.6'

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.5
David Goulet [Fri, 29 Oct 2021 13:20:21 +0000 (09:20 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.5

4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Fri, 29 Oct 2021 13:20:21 +0000 (09:20 -0400)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agochanges: Add file for ticket 26299
David Goulet [Fri, 29 Oct 2021 13:20:17 +0000 (09:20 -0400)] 
changes: Add file for ticket 26299

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agochanges: Add file for ticket 26299
David Goulet [Fri, 29 Oct 2021 13:19:59 +0000 (09:19 -0400)] 
changes: Add file for ticket 26299

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agochanges: Add file for ticket 26299
David Goulet [Fri, 29 Oct 2021 13:19:21 +0000 (09:19 -0400)] 
changes: Add file for ticket 26299

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agodon't retry entry guards if they're bridges without descriptors
Roger Dingledine [Sun, 24 Oct 2021 00:32:36 +0000 (20:32 -0400)] 
don't retry entry guards if they're bridges without descriptors

When we don't yet have a descriptor for one of our bridges, disable
the entry guard retry schedule on that bridge. The entry guard retry
schedule and the bridge descriptor retry schedule can conflict,
e.g. where we mark a bridge as "maybe up" yet we don't try to fetch
its descriptor yet, leading Tor to wait (refusing to do anything)
until it becomes time to fetch the descriptor.

Fixes bug 40497; bugfix on 0.3.0.3-alpha.

4 years agodo notice-level log when we resume having enough dir info
Roger Dingledine [Sat, 23 Oct 2021 09:24:29 +0000 (05:24 -0400)] 
do notice-level log when we resume having enough dir info

we do a notice-level log when we decide we *don't* have enough dir
info, but in 0.3.5.1-alpha (see commit eee62e13d97, #14950) we lost our
corresponding notice-level log when things come back.

bugfix on 0.3.5.1-alpha; fixes bug 40496.

4 years agohandle other de-sync cases from #40396
Roger Dingledine [Fri, 29 Oct 2021 00:39:31 +0000 (20:39 -0400)] 
handle other de-sync cases from #40396

Specifically, every time a guard moves into or out of state
GUARD_REACHABLE_MAYBE, it is an opportunity for the guard reachability
state to get out of sync with the have-minimum-dir-info state.

Fixes even more of #40396.

4 years agoreassess minimum-dir-info when a bridge fails
Roger Dingledine [Fri, 22 Oct 2021 06:33:49 +0000 (02:33 -0400)] 
reassess minimum-dir-info when a bridge fails

When we try to fetch a bridge descriptor and we fail, we mark
the guard as failed, but we never scheduled a re-compute for
router_have_minimum_dir_info().

So if we had already decided we needed to wait for this new descriptor,
we would just wait forever -- even if, counterintuitively, *losing* the
bridge is just what we need to *resume* using the network, if we had it
in state GUARD_REACHABLE_MAYBE and we were stalling to learn this outcome.

See bug 40396 for more details.

4 years agoonly log "new bridge descriptor" if really new
Roger Dingledine [Fri, 29 Oct 2021 00:53:26 +0000 (20:53 -0400)] 
only log "new bridge descriptor" if really new

The bridge descriptor fetching codes ends up fetching a lot of duplicate
bridge descriptors, because this is how we learn when the descriptor
changes.

This commit only changes comments plus whether we log that one line.

It moves us back to the old behavior, before the previous commit for
30496, where we would only log that line when the bridge descriptor
we're talking about is better than the one we already had (if any).

4 years agomakefile: Add a reproducible dist make job
David Goulet [Thu, 28 Oct 2021 20:29:22 +0000 (16:29 -0400)] 
makefile: Add a reproducible dist make job

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agomakefile: Add a reproducible dist make job
David Goulet [Thu, 28 Oct 2021 20:29:22 +0000 (16:29 -0400)] 
makefile: Add a reproducible dist make job

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agomakefile: Add a reproducible dist make job
David Goulet [Thu, 28 Oct 2021 20:29:22 +0000 (16:29 -0400)] 
makefile: Add a reproducible dist make job

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agorelease: Patches to make tarball reproducible
Alexander Færøy [Fri, 10 Jul 2020 00:31:35 +0000 (02:31 +0200)] 
release: Patches to make tarball reproducible

Closes #26299

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agorelease: Patches to make tarball reproducible
Alexander Færøy [Fri, 10 Jul 2020 00:31:35 +0000 (02:31 +0200)] 
release: Patches to make tarball reproducible

Closes #26299

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.4.6'
David Goulet [Thu, 28 Oct 2021 18:27:17 +0000 (14:27 -0400)] 
Merge branch 'maint-0.4.6'

4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Thu, 28 Oct 2021 18:26:35 +0000 (14:26 -0400)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agochanges: Typo in file, wrong version was used
David Goulet [Thu, 28 Oct 2021 18:22:14 +0000 (14:22 -0400)] 
changes: Typo in file, wrong version was used

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agorelease: Patches to make tarball reproducible
Alexander Færøy [Fri, 10 Jul 2020 00:31:35 +0000 (02:31 +0200)] 
release: Patches to make tarball reproducible

Closes #26299

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.4.6'
David Goulet [Thu, 28 Oct 2021 14:38:20 +0000 (10:38 -0400)] 
Merge branch 'maint-0.4.6'

4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Thu, 28 Oct 2021 14:38:20 +0000 (10:38 -0400)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agoFix compilation on systems with older compilers.
Alexander Færøy [Thu, 10 Jun 2021 20:04:13 +0000 (20:04 +0000)] 
Fix compilation on systems with older compilers.

This patch fixes a build error with GCC 7.x which doesn't seem to accept
const int's as constants in macro initialization.

See: tpo/core/tor#40410

4 years agoMerge branch 'maint-0.4.6'
David Goulet [Thu, 28 Oct 2021 13:42:38 +0000 (09:42 -0400)] 
Merge branch 'maint-0.4.6'

4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Thu, 28 Oct 2021 13:42:32 +0000 (09:42 -0400)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.5
David Goulet [Thu, 28 Oct 2021 13:42:25 +0000 (09:42 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.5

4 years agoversion: Missing version update in couple files
David Goulet [Thu, 28 Oct 2021 13:42:08 +0000 (09:42 -0400)] 
version: Missing version update in couple files

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoversion: Missing version update in couple files
David Goulet [Thu, 28 Oct 2021 13:41:56 +0000 (09:41 -0400)] 
version: Missing version update in couple files

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoversion: Missing version update in couple files
David Goulet [Thu, 28 Oct 2021 13:41:13 +0000 (09:41 -0400)] 
version: Missing version update in couple files

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoversion: Missing version update in couple files
David Goulet [Thu, 28 Oct 2021 13:40:50 +0000 (09:40 -0400)] 
version: Missing version update in couple files

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoscripts: Quiet the IPFire location GeoIP command
David Goulet [Wed, 27 Oct 2021 14:24:13 +0000 (10:24 -0400)] 
scripts: Quiet the IPFire location GeoIP command

We do this to avoid useless outputs but also, in the CI environement,
the Python logging package stacktraces with a problem on a socket.

The command still works but the logging fails. With the quiet switch, we
don't get such stacktrace.

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoscripts: Add -M option to git-list-tor-branches.sh
David Goulet [Tue, 26 Oct 2021 19:52:51 +0000 (15:52 -0400)] 
scripts: Add -M option to git-list-tor-branches.sh

Omit all "maint" branch. It is the opposite of -R that omits release
branches.

In other words, -M can be used to list all release branches.

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Tue, 26 Oct 2021 18:33:49 +0000 (14:33 -0400)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.5
David Goulet [Tue, 26 Oct 2021 18:33:49 +0000 (14:33 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.5

4 years agoMerge branch 'maint-0.4.6'
David Goulet [Tue, 26 Oct 2021 18:33:49 +0000 (14:33 -0400)] 
Merge branch 'maint-0.4.6'

4 years agoci: Missing source dir when parsing configure.ac version
David Goulet [Tue, 26 Oct 2021 18:33:31 +0000 (14:33 -0400)] 
ci: Missing source dir when parsing configure.ac version

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.4.6'
David Goulet [Tue, 26 Oct 2021 15:31:41 +0000 (11:31 -0400)] 
Merge branch 'maint-0.4.6'

4 years agoversion: Bump to 0.4.7.2-alpha-dev
David Goulet [Tue, 26 Oct 2021 15:31:38 +0000 (11:31 -0400)] 
version: Bump to 0.4.7.2-alpha-dev

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Tue, 26 Oct 2021 15:31:28 +0000 (11:31 -0400)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agoversion: Bump to 0.4.6.8-dev
David Goulet [Tue, 26 Oct 2021 15:31:24 +0000 (11:31 -0400)] 
version: Bump to 0.4.6.8-dev

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.3.5' into maint-0.4.5
David Goulet [Tue, 26 Oct 2021 15:31:14 +0000 (11:31 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.5

4 years agoversion: Bump to 0.4.5.11-dev
David Goulet [Tue, 26 Oct 2021 15:31:06 +0000 (11:31 -0400)] 
version: Bump to 0.4.5.11-dev

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoversion: Bump to 0.3.5.17-dev
David Goulet [Tue, 26 Oct 2021 15:30:56 +0000 (11:30 -0400)] 
version: Bump to 0.3.5.17-dev

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoversion: Bump to 0.4.7.2-alpha tor-0.4.7.2-alpha
David Goulet [Tue, 26 Oct 2021 13:23:35 +0000 (09:23 -0400)] 
version: Bump to 0.4.7.2-alpha

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.4.6'
David Goulet [Tue, 26 Oct 2021 13:18:05 +0000 (09:18 -0400)] 
Merge branch 'maint-0.4.6'

4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Tue, 26 Oct 2021 13:17:58 +0000 (09:17 -0400)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agoMerge branch 'maint-0.3.5' into maint-0.4.5
David Goulet [Tue, 26 Oct 2021 13:17:52 +0000 (09:17 -0400)] 
Merge branch 'maint-0.3.5' into maint-0.4.5

4 years agoversion: Bump to 0.4.6.8
David Goulet [Tue, 26 Oct 2021 13:17:01 +0000 (09:17 -0400)] 
version: Bump to 0.4.6.8

Signed-off-by: David Goulet <dgoulet@torproject.org>