]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
4 years agoMerge branch 'maint-0.4.6' into main
Alexander Færøy [Wed, 11 Aug 2021 13:15:59 +0000 (13:15 +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 [Wed, 11 Aug 2021 13:15:59 +0000 (13:15 +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 [Wed, 11 Aug 2021 13:15:58 +0000 (13:15 +0000)] 
Merge branch 'maint-0.3.5' into maint-0.4.5

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/417' into maint-0.3.5
Alexander Færøy [Wed, 11 Aug 2021 13:15:35 +0000 (13:15 +0000)] 
Merge remote-tracking branch 'tor-gitlab/mr/417' into maint-0.3.5

4 years agoMerge branch 'maint-0.4.6' into main
Alexander Færøy [Wed, 11 Aug 2021 13:14:26 +0000 (13:14 +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 [Wed, 11 Aug 2021 13:14:26 +0000 (13:14 +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 [Wed, 11 Aug 2021 13:14:26 +0000 (13:14 +0000)] 
Merge branch 'maint-0.3.5' into maint-0.4.5

4 years agoDisable ed25519-donna's batch verification.
George Kadianakis [Fri, 30 Jul 2021 13:35:48 +0000 (16:35 +0300)] 
Disable ed25519-donna's batch verification.

Fixes bug 40078.

As reported by hdevalence our batch verification logic can cause an assert
crash.

The assert happens because when the batch verification of ed25519-donna fails,
the code in `ed25519_checksig_batch()` falls back to doing a single
verification for each signature.

The crash occurs because batch verification failed, but then all signatures
individually verified just fine.

That's because batch verification and single verification use a different
equation which means that there are sigs that can pass single verification
but fail batch verification.

Fixing this would require modding ed25519-donna which is not in scope for
this ticket, and will be soon deprecated in favor of arti and
ed25519-dalek, so my branch instead removes batch verification.

4 years agoMerge branch 'maint-0.4.6' into main
Alexander Færøy [Wed, 11 Aug 2021 13:07:46 +0000 (13:07 +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 [Wed, 11 Aug 2021 13:07:46 +0000 (13:07 +0000)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agofallbackdir: Regenerate list
David Goulet [Wed, 11 Aug 2021 13:04:40 +0000 (09:04 -0400)] 
fallbackdir: Regenerate list

New list for all stable releases.

Closes #40447

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.3.5' into maint-0.4.5
Alexander Færøy [Wed, 11 Aug 2021 13:06:12 +0000 (13:06 +0000)] 
Merge branch 'maint-0.3.5' into maint-0.4.5

4 years agorelay: Reduce streaming compression ratio from HIGH to LOW
David Goulet [Thu, 18 Feb 2021 17:49:33 +0000 (12:49 -0500)] 
relay: Reduce streaming compression ratio from HIGH to LOW

Fixes #40301

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge branch 'maint-0.4.6' into main
Alexander Færøy [Wed, 11 Aug 2021 12:48:04 +0000 (12:48 +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 [Wed, 11 Aug 2021 12:48:04 +0000 (12:48 +0000)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agorelay: Reduce streaming compression ratio from HIGH to LOW
David Goulet [Thu, 18 Feb 2021 17:49:33 +0000 (12:49 -0500)] 
relay: Reduce streaming compression ratio from HIGH to LOW

Fixes #40301

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMake inbuf and outbuf len check params const
Mike Perry [Tue, 20 Jul 2021 18:30:23 +0000 (18:30 +0000)] 
Make inbuf and outbuf len check params const

4 years agoMAKEFILE: include new CC algs in makefile
Mike Perry [Fri, 11 Jun 2021 23:52:06 +0000 (23:52 +0000)] 
MAKEFILE: include new CC algs in makefile

4 years agoTOR_NOLA: Implement a pure BDP tracking CC alg
Mike Perry [Fri, 11 Jun 2021 23:50:37 +0000 (23:50 +0000)] 
TOR_NOLA: Implement a pure BDP tracking CC alg

How come no one ever named a congestion control algorithm after New Orleans?

4 years agoTOR_VEGAS: Implement Prop#324 TOR_VEGAS.
Mike Perry [Fri, 11 Jun 2021 23:50:09 +0000 (23:50 +0000)] 
TOR_VEGAS: Implement Prop#324 TOR_VEGAS.

4 years agoTOR_WESTWOOD: Implement Prop#324 TOR_WESTWOOD
Mike Perry [Sun, 13 Jun 2021 02:20:00 +0000 (02:20 +0000)] 
TOR_WESTWOOD: Implement Prop#324 TOR_WESTWOOD

4 years agoProp#324: Free congestion control object on circ and cpath
Mike Perry [Sat, 3 Jul 2021 06:03:52 +0000 (06:03 +0000)] 
Prop#324: Free congestion control object on circ and cpath

4 years agoProp#324: Hook up CC window checks for relay cell packaging
Mike Perry [Fri, 11 Jun 2021 23:53:59 +0000 (23:53 +0000)] 
Prop#324: Hook up CC window checks for relay cell packaging

4 years agoProp#324: Hook up CC algs to main sendme callpoints
Mike Perry [Fri, 9 Jul 2021 22:10:21 +0000 (22:10 +0000)] 
Prop#324: Hook up CC algs to main sendme callpoints

4 years agoProp#324: Add congestion control state to structs
Mike Perry [Thu, 10 Jun 2021 23:10:15 +0000 (23:10 +0000)] 
Prop#324: Add congestion control state to structs

4 years agoProp#324: Common RTT, BDP, and blocked channel signal support
Mike Perry [Thu, 10 Jun 2021 23:08:24 +0000 (23:08 +0000)] 
Prop#324: Common RTT, BDP, and blocked channel signal support

4 years agoMerge branch 'vanguards-lite-dev-rebased'
George Kadianakis [Wed, 28 Jul 2021 09:00:37 +0000 (12:00 +0300)] 
Merge branch 'vanguards-lite-dev-rebased'

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/412'
Nick Mathewson [Fri, 23 Jul 2021 19:06:06 +0000 (15:06 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/412'

4 years agoCorrect another ReleasingTor.md issue
Nick Mathewson [Fri, 23 Jul 2021 18:50:23 +0000 (14:50 -0400)] 
Correct another ReleasingTor.md issue

4 years agoUpdate ReleasingTor.md to reflect current practice
Nick Mathewson [Fri, 23 Jul 2021 18:47:49 +0000 (14:47 -0400)] 
Update ReleasingTor.md to reflect current practice

4 years agocircpad: Be smarter on when to send back STOP cells.
George Kadianakis [Thu, 22 Jul 2021 12:02:13 +0000 (15:02 +0300)] 
circpad: Be smarter on when to send back STOP cells.

4 years agoUpdate changes file with the new proposal number #333.
George Kadianakis [Wed, 21 Jul 2021 09:43:52 +0000 (12:43 +0300)] 
Update changes file with the new proposal number #333.

4 years agoIncrease frequency of vg-lite callback to 15 minutes
George Kadianakis [Tue, 20 Jul 2021 10:03:32 +0000 (13:03 +0300)] 
Increase frequency of vg-lite callback to 15 minutes

4 years agoRemove some needless includes
Nick Mathewson [Mon, 12 Jul 2021 19:53:56 +0000 (15:53 -0400)] 
Remove some needless includes

4 years agoRemove fuzz_hexdigest.c: It is already covered by other fuzzers
Nick Mathewson [Mon, 12 Jul 2021 19:42:32 +0000 (15:42 -0400)] 
Remove fuzz_hexdigest.c: It is already covered by other fuzzers

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/407'
Nick Mathewson [Mon, 12 Jul 2021 19:41:12 +0000 (15:41 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/407'

4 years agotest_hs_ob: initialize pointers to NULL
Nick Mathewson [Mon, 12 Jul 2021 18:59:29 +0000 (14:59 -0400)] 
test_hs_ob: initialize pointers to NULL

This is an attempt to fix CID 1486280, where coverity warns us that,
if the tests failed, we might free() an uninitialized pointer.

4 years agotest_hs_control: initialize pointers to NULL
Nick Mathewson [Mon, 12 Jul 2021 18:59:29 +0000 (14:59 -0400)] 
test_hs_control: initialize pointers to NULL

This is an attempt to fix CID 1486276, where coverity warns us that,
if the tests failed, we might free() an uninitialized pointer.

4 years agoAdd stricter limits to the number of L2 nodes
George Kadianakis [Mon, 12 Jul 2021 09:10:43 +0000 (12:10 +0300)] 
Add stricter limits to the number of L2 nodes

4 years agoAdd a switch to toggle the feature on/off
George Kadianakis [Mon, 12 Jul 2021 08:45:31 +0000 (11:45 +0300)] 
Add a switch to toggle the feature on/off

4 years agoService intro circuits are now 4-hop to avoid linkability by intro
George Kadianakis [Mon, 12 Jul 2021 08:23:00 +0000 (11:23 +0300)] 
Service intro circuits are now 4-hop to avoid linkability by intro

Now the circuits look like this:

 client rend:   C -> G -> L2 -> Rend
 client intro:  C -> G -> L2 -> M -> Intro
 client hsdir:  C -> G -> L2 -> M -> HSDir
 service rend:  C -> G -> L2 -> M -> Rend
 service intro: C -> G -> L2 -> M -> Intro
 service hsdir: C -> G -> L2 -> M -> HSDir

4 years agoAdd layer2_guard_free()
George Kadianakis [Fri, 9 Jul 2021 13:54:24 +0000 (16:54 +0300)] 
Add layer2_guard_free()

4 years agoDon't double-pick L2 nodes
George Kadianakis [Fri, 9 Jul 2021 13:48:26 +0000 (16:48 +0300)] 
Don't double-pick L2 nodes

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/410'
Nick Mathewson [Thu, 8 Jul 2021 18:17:54 +0000 (14:17 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/410'

4 years agoMerge branch 'maint-0.4.6'
George Kadianakis [Wed, 7 Jul 2021 10:04:39 +0000 (13:04 +0300)] 
Merge branch 'maint-0.4.6'

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/406' into maint-0.4.6
George Kadianakis [Wed, 7 Jul 2021 10:04:24 +0000 (13:04 +0300)] 
Merge remote-tracking branch 'tor-gitlab/mr/406' into maint-0.4.6

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/406'
George Kadianakis [Wed, 7 Jul 2021 10:02:11 +0000 (13:02 +0300)] 
Merge remote-tracking branch 'tor-gitlab/mr/406'

4 years agoUpdate torrc to encourage use of BridgeDistribution
Cecylia Bocovich [Tue, 6 Jul 2021 17:09:24 +0000 (13:09 -0400)] 
Update torrc to encourage use of BridgeDistribution

Bridge operators should generally publish their descriptors except for
rare cases, and instead use the BridgeDistribution none setting to
prevent their bridge from being distributed by BridgeDB.

4 years agoMerge branch 'maint-0.4.6'
George Kadianakis [Tue, 6 Jul 2021 10:52:16 +0000 (13:52 +0300)] 
Merge branch 'maint-0.4.6'

4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
George Kadianakis [Tue, 6 Jul 2021 10:52:15 +0000 (13:52 +0300)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/409' into maint-0.4.5
George Kadianakis [Tue, 6 Jul 2021 10:51:58 +0000 (13:51 +0300)] 
Merge remote-tracking branch 'tor-gitlab/mr/409' into maint-0.4.5

4 years agoMerge branch 'maint-0.4.6'
George Kadianakis [Tue, 6 Jul 2021 10:42:53 +0000 (13:42 +0300)] 
Merge branch 'maint-0.4.6'

4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
George Kadianakis [Tue, 6 Jul 2021 10:42:53 +0000 (13:42 +0300)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agoMerge branch 'mr/395' into maint-0.4.5
George Kadianakis [Tue, 6 Jul 2021 10:42:29 +0000 (13:42 +0300)] 
Merge branch 'mr/395' into maint-0.4.5

4 years agoUse native timegm when available.
Nick Mathewson [Tue, 1 Jun 2021 20:18:23 +0000 (16:18 -0400)] 
Use native timegm when available.

Continue having a tor_gmtime_impl() unit test so that we can detect
any problems in our replacement function; add a new test function to
make sure that gmtime<->timegm are a round-trip on now-ish times.

This is a fix for bug #40383, wherein we ran into trouble because
tor_timegm() does not believe that time_t should include a count of
leap seconds, but FreeBSD's gmtime believes that it should.  This
disagreement meant that for a certain amount of time each day,
instead of calculating the most recent midnight, our voting-schedule
functions would calculate the second-most-recent midnight, and lead
to an assertion failure.

I am calling this a bugfix on 0.2.0.3-alpha when we first started
calculating our voting schedule in this way.

4 years agoCode improvements
George Kadianakis [Tue, 6 Jul 2021 10:22:59 +0000 (13:22 +0300)] 
Code improvements

4 years agoSuppress a clang 12 warning about "suspicious concatenation".
Nick Mathewson [Thu, 1 Jul 2021 17:03:19 +0000 (13:03 -0400)] 
Suppress a clang 12 warning about "suspicious concatenation".

My clang doesn't like it when we write code like this:

    char *list[] = {
       "abc",
       "def",
       "ghi"
       "jkl"
    }

It wonders whether we meant to put a comma between "ghi" and "jkl"
or not, and gives a warning.

To suppress this warning (since in this case, we did mean to omit
the comma), we just wrap the two strings in parentheses.

Closes #40426; bugfix on 0.4.0.4-rc.

4 years agoSimplify cannibalization logic now that all HS is vanguards
George Kadianakis [Thu, 1 Jul 2021 14:56:56 +0000 (17:56 +0300)] 
Simplify cannibalization logic now that all HS is vanguards

Co-authored-by: Mike Perry <mikeperry-git@torproject.org>
4 years agoSpecial vanguard L3 increased path length does not apply for vanguards-lite
George Kadianakis [Thu, 1 Jul 2021 14:52:58 +0000 (17:52 +0300)] 
Special vanguard L3 increased path length does not apply for vanguards-lite

Co-authored-by: Mike Perry <mikeperry-git@torproject.org>
4 years agoPreemptive circuits for HSes should now be vanguard circuits
George Kadianakis [Thu, 1 Jul 2021 14:50:41 +0000 (17:50 +0300)] 
Preemptive circuits for HSes should now be vanguard circuits

Co-authored-by: Mike Perry <mikeperry-git@torproject.org>
4 years agoUse L2 vanguards during path selection
George Kadianakis [Thu, 1 Jul 2021 14:49:27 +0000 (17:49 +0300)] 
Use L2 vanguards during path selection

Co-authored-by: Mike Perry <mikeperry-git@torproject.org>
4 years agoIntroduce vanguards-lite subsystem and some of its entry points
George Kadianakis [Thu, 1 Jul 2021 14:42:34 +0000 (17:42 +0300)] 
Introduce vanguards-lite subsystem and some of its entry points

Co-authored-by: Mike Perry <mikeperry-git@torproject.org>
4 years agoUpdate fuzz_hexdigest.c
pedbap [Thu, 1 Jul 2021 14:37:05 +0000 (14:37 +0000)] 
Update fuzz_hexdigest.c

4 years agoUpdate fuzz_address.c
pedbap [Thu, 1 Jul 2021 14:36:39 +0000 (14:36 +0000)] 
Update fuzz_address.c

4 years agoUpdate fuzz_addressPTR.c
pedbap [Thu, 1 Jul 2021 14:36:06 +0000 (14:36 +0000)] 
Update fuzz_addressPTR.c

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/405'
Nick Mathewson [Thu, 1 Jul 2021 13:56:35 +0000 (09:56 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/405'

4 years agoUpdate fuzzing_include_am.py
pedbap [Thu, 1 Jul 2021 13:54:31 +0000 (13:54 +0000)] 
Update fuzzing_include_am.py

4 years agoUpdate fuzzing_include_am.py
pedbap [Thu, 1 Jul 2021 13:54:14 +0000 (13:54 +0000)] 
Update fuzzing_include_am.py

4 years agoUpdate include.am
pedbap [Thu, 1 Jul 2021 13:16:10 +0000 (13:16 +0000)] 
Update include.am

4 years agoMerge branch 'maint-0.4.6'
Nick Mathewson [Wed, 30 Jun 2021 16:02:17 +0000 (12:02 -0400)] 
Merge branch 'maint-0.4.6'

"ours" to avoid version bump.

4 years agoBump to 0.4.6.6-dev
Nick Mathewson [Wed, 30 Jun 2021 16:01:21 +0000 (12:01 -0400)] 
Bump to 0.4.6.6-dev

4 years agoTweak 0466 changelog
Nick Mathewson [Wed, 30 Jun 2021 14:09:28 +0000 (10:09 -0400)] 
Tweak 0466 changelog

4 years agoMerge branch 'maint-0.4.6'
Nick Mathewson [Wed, 30 Jun 2021 12:18:24 +0000 (08:18 -0400)] 
Merge branch 'maint-0.4.6'

"ours" to avoid version bump.

4 years agoUpdate version to 0.4.6.6.
Nick Mathewson [Wed, 30 Jun 2021 12:17:56 +0000 (08:17 -0400)] 
Update version to 0.4.6.6.

4 years agoMerge branch 'maint-0.4.6'
Nick Mathewson [Wed, 30 Jun 2021 12:15:41 +0000 (08:15 -0400)] 
Merge branch 'maint-0.4.6'

4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
Nick Mathewson [Wed, 30 Jun 2021 12:15:41 +0000 (08:15 -0400)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agoMissing changes file for #40409
Nick Mathewson [Wed, 30 Jun 2021 12:14:57 +0000 (08:14 -0400)] 
Missing changes file for #40409

4 years agoAdding new fuzzing harnesses for Makefile
pedbap [Tue, 29 Jun 2021 19:31:08 +0000 (19:31 +0000)] 
Adding new fuzzing harnesses for Makefile

4 years agotor_addr_parse_PTR_name() isolated harness
pedbap [Tue, 29 Jun 2021 19:15:24 +0000 (19:15 +0000)] 
tor_addr_parse_PTR_name() isolated harness

4 years agotor_addr_parse() fuzzing harness
pedbap [Tue, 29 Jun 2021 19:13:38 +0000 (19:13 +0000)] 
tor_addr_parse() fuzzing harness

4 years agohexdigest_to_digest() isolated harness
pedbap [Tue, 29 Jun 2021 19:11:45 +0000 (19:11 +0000)] 
hexdigest_to_digest() isolated harness

4 years agoMerge branch 'tor-gitlab/mr/275'
David Goulet [Tue, 29 Jun 2021 14:55:46 +0000 (10:55 -0400)] 
Merge branch 'tor-gitlab/mr/275'

4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Tue, 29 Jun 2021 14:41:36 +0000 (10:41 -0400)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agoMerge branch 'maint-0.4.6'
David Goulet [Tue, 29 Jun 2021 14:41:36 +0000 (10:41 -0400)] 
Merge branch 'maint-0.4.6'

4 years agohs: Send back 0xF6 for a v2 onion address
David Goulet [Tue, 29 Jun 2021 13:56:44 +0000 (09:56 -0400)] 
hs: Send back 0xF6 for a v2 onion address

Fixes #40421

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoIf TestingTorNetwork, skip perm check on the hs directory
Steven Engler [Mon, 28 Jun 2021 17:35:11 +0000 (13:35 -0400)] 
If TestingTorNetwork, skip perm check on the hs directory

4 years agoSuppress strict-prototypes warning on NSS pk11pub.h header
Nick Mathewson [Mon, 28 Jun 2021 13:08:31 +0000 (09:08 -0400)] 
Suppress strict-prototypes warning on NSS pk11pub.h header

We already did this in a couple of places, but there are more that
we didn't get.  This is necessary for systems with versions of
NSS that don't do their prototypes properly.

Fixes #40409; bugfix on 0.3.5.1-alpha.

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/385'
George Kadianakis [Mon, 28 Jun 2021 11:11:46 +0000 (14:11 +0300)] 
Merge remote-tracking branch 'tor-gitlab/mr/385'

4 years agoMerge branch 'maint-0.4.5' into maint-0.4.6
Nick Mathewson [Sat, 26 Jun 2021 14:04:38 +0000 (10:04 -0400)] 
Merge branch 'maint-0.4.5' into maint-0.4.6

4 years agoMerge branch 'maint-0.4.6'
Nick Mathewson [Sat, 26 Jun 2021 14:04:38 +0000 (10:04 -0400)] 
Merge branch 'maint-0.4.6'

4 years agoEnable deterministic RNG for address set tests.
Alexander Færøy [Fri, 25 Jun 2021 16:29:53 +0000 (16:29 +0000)] 
Enable deterministic RNG for address set tests.

This patch enables the deterministic RNG for address set tests,
including the tests which uses address set indirectly via the nodelist
API.

This should prevent random test failures in the highly unlikely case of
a false positive which was seen in tor#40419.

See: tpo/core/tor#40419.

4 years agoMerge branch 'maint-0.4.6'
David Goulet [Fri, 18 Jun 2021 18:29:15 +0000 (14:29 -0400)] 
Merge branch '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 agogit: Don't pull github anymore in git-pull-all.sh
David Goulet [Wed, 16 Jun 2021 14:53:32 +0000 (10:53 -0400)] 
git: Don't pull github anymore in git-pull-all.sh

Signed-off-by: David Goulet <dgoulet@torproject.org>
4 years agoMerge remote-tracking branch 'tor-gitlab/mr/338'
Nick Mathewson [Mon, 14 Jun 2021 17:10:18 +0000 (13:10 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/338'

4 years agoMerge remote-tracking branch 'tor-gitlab/mr/397'
Nick Mathewson [Mon, 14 Jun 2021 17:05:03 +0000 (13:05 -0400)] 
Merge remote-tracking branch 'tor-gitlab/mr/397'

4 years agoCopy forward ChangeLog and ReleaseNotes from 0.3.5.15, 0.4.4.9, and 0.4.5.9
Nick Mathewson [Mon, 14 Jun 2021 15:55:48 +0000 (11:55 -0400)] 
Copy forward ChangeLog and ReleaseNotes from 0.3.5.15, 0.4.4.9, and 0.4.5.9

4 years agoCopy the 0.4.6.5 changelog and releasenotes to main.
Nick Mathewson [Mon, 14 Jun 2021 15:53:12 +0000 (11:53 -0400)] 
Copy the 0.4.6.5 changelog and releasenotes to main.

4 years agoRemove 0.4.4 from list-tor-branches.
Nick Mathewson [Mon, 14 Jun 2021 15:50:00 +0000 (11:50 -0400)] 
Remove 0.4.4 from list-tor-branches.

4 years agoMerge branch 'maint-0.4.6'
Nick Mathewson [Mon, 14 Jun 2021 15:48:46 +0000 (11:48 -0400)] 
Merge branch 'maint-0.4.6'

"ours" to avoid version bump.