David Goulet
d3bcbccab9
Merge branch 'maint-0.4.4'
2020-06-23 08:52:33 -04:00
David Goulet
5232315168
Merge branch 'tor-github/pr/1937' into maint-0.4.4
2020-06-23 08:52:16 -04:00
Nick Mathewson
ceddc39c59
Merge branch 'pr_1930_squashed'
2020-06-22 15:33:27 -04:00
Neel Chauhan
5a89fd2a04
Add changes file for ticket 33816
2020-06-22 15:33:03 -04:00
Neel Chauhan
3bb955a02f
Add circuit_extend_add_ipv(4/6)_helper() test
2020-06-22 15:33:03 -04:00
Neel Chauhan
48310a0e76
Fill in missing IPv6 addresses in extend cells
2020-06-22 15:33:03 -04:00
David Goulet
033f804429
Merge branch 'maint-0.4.4'
2020-06-22 14:57:50 -04:00
Miguel Jacq
3d0e1c42d9
Consistently use 'address' in Invalid v3 address responses to ONION_CLIENT_AUTH commands
2020-06-22 14:56:07 -04:00
Nick Mathewson
b67f7d722d
Update the list of recommended protocol versions to match >=0.3.5.
...
Since Tor 0.2.9 has been unsupported since January, 0.3.5 is the
oldest supported version, and its features constitute the oldest
recommended feature-set.
This patch updates these recommendations:
DirCache=2
Support for consensus diffs.
New in 0.3.1.1-alpha.
HSDir=2
Support for v3 onion service descriptors.
New in 0.3.0.4-alpha.
HSIntro=4
Support for Ed25519 intropoint authentication keys.
New in 0.3.0-4-alpha.
HSRend=2
Support for rendezvous cells longer than 20 bytes.
New in 0.2.9.4-alpha.
Link=5
Link padding and link padding negotiation.
New in 0.3.3.2-alpha.
LinkAuth=3
Ed25519 link authentication.
New in 0.3.0.1-alpha.
2020-06-17 11:07:43 -04:00
Nick Mathewson
a82c0cdfcf
Spelling fix: "RECCOMEND" => "RECOMMEND".
2020-06-17 10:37:47 -04:00
Nick Mathewson
48ff6a41ae
Merge branch 'maint-0.4.4'
...
"ours" to avoid version bump.
2020-06-16 19:39:03 -04:00
Nick Mathewson
93d582b8e9
Bump to 0.4.4.1-alpha-dev
2020-06-16 19:38:38 -04:00
Nick Mathewson
0b889e709d
forward-port the changelog for 0.4.4.1-alpha
2020-06-16 17:52:45 -04:00
Nick Mathewson
285dbeefa1
Merge branch 'maint-0.4.4'
...
"ours" to avoid version bump.
2020-06-15 16:45:25 -04:00
Nick Mathewson
148291a52e
Bump to 0.4.4.1-alpha
2020-06-15 16:45:18 -04:00
Nick Mathewson
7e600a74bc
Merge branch 'maint-0.4.4'
2020-06-15 16:43:18 -04:00
Nick Mathewson
85c0ba1cfb
forward-port changelog and release-notes from 0.4.3.5
2020-06-15 16:43:09 -04:00
Nick Mathewson
9fdaede3f7
Remove AssumeReachable from TestingTorNetwork.
...
Closes ticket 34446.
2020-06-15 14:08:42 -04:00
David Goulet
8361e3c4ab
core: Remove unused files
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-06-12 14:40:49 -04:00
David Goulet
75734f48aa
Merge branch 'maint-0.4.3' into maint-0.4.4
2020-06-12 12:55:41 -04:00
David Goulet
ffc2405621
Merge branch 'maint-0.4.4'
2020-06-12 12:55:41 -04:00
David Goulet
272c171136
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-12 12:55:41 -04:00
David Goulet
0f218a05a6
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-12 12:55:41 -04:00
David Goulet
53faca10ad
Merge branch 'tor-github/pr/1913'
2020-06-12 12:55:34 -04:00
David Goulet
6a43aadecc
Merge branch 'tor-github/pr/1912' into maint-0.3.5
2020-06-12 12:55:17 -04:00
George Kadianakis
3cb77a9cca
Merge branch 'maint-0.4.4'
2020-06-11 17:29:54 +03:00
George Kadianakis
52edea121e
Fold in a changes file and update exceptions.txt.
...
Co-authored-by: Florentin Rochet <florentin.rochet@uclouvain.be>
2020-06-11 16:13:25 +03:00
George Kadianakis
755b8252a4
Fix and update unittests.
...
Co-authored-by: Florentin Rochet <florentin.rochet@uclouvain.be>
2020-06-11 16:13:20 +03:00
George Kadianakis
714e235a3c
Update functions that load and write the guard state file.
...
Co-authored-by: Florentin Rochet <florentin.rochet@uclouvain.be>
2020-06-11 16:13:13 +03:00
George Kadianakis
d2c3b6ea1e
Pick guards on the order they were sampled (prop310).
...
Co-authored-by: Florentin Rochet <florentin.rochet@uclouvain.be>
2020-06-11 16:13:09 +03:00
Florentin Rochet
7bf0587ef1
Refactor some guard state file parsing code into functions.
...
Co-authored-by: Florentin Rochet <florentin.rochet@uclouvain.be>
2020-06-11 16:12:31 +03:00
George Kadianakis
1797d05165
Merge branch 'tor-github/pr/1925'
2020-06-10 15:37:59 +03:00
Mike Perry
963c3591c8
Bug 30992: Changes file
2020-06-10 15:37:44 +03:00
Mike Perry
1300e6a512
Bug 30992: Update tests
2020-06-10 15:37:44 +03:00
Mike Perry
0a4bc8fe90
Bug 30992: Track a padding machine ctr to reduce race issues.
...
This tracking of the instantiation count should eliminate race conditions due
to starting and stopping machines rapidly. Now, we should no longer obey
STOP commands for previous machines.
2020-06-10 15:37:44 +03:00
Nick Mathewson
1e230bd488
Merge branch 'maint-0.4.4'
...
("Ours" to avoid removal of .enable_practracker_in_hooks)
2020-06-09 15:47:44 -04:00
Nick Mathewson
fc16dbf7aa
Remove "enable_practracker_in_hooks" for 0.4.4.
2020-06-09 15:47:25 -04:00
Nick Mathewson
354f085e5f
Merge remote-tracking branch 'tor-github/pr/1888/head'
2020-06-09 15:44:58 -04:00
Nick Mathewson
eaae5625cb
Add 0.4.4 to list of tor branches used by git scripts.
2020-06-09 14:17:15 -04:00
Nick Mathewson
ca8b04f194
Merge branch 'ticket34375'
2020-06-09 14:16:21 -04:00
Nick Mathewson
d2f136aab1
Bump version to 0.4.5.0-alpha-dev
2020-06-09 14:14:43 -04:00
Mike Perry
9eb0eeb68e
Update Trunnel for new machine_ctr field.
...
This field area was memset to 0 in old versions, which the code treats as
"match any machine instance", for backward compatibility without a protover
bump.
2020-06-08 18:05:34 -05:00
c
76d07940fd
scripts/maint: Remove obsolete generated tor.sh
...
Per <https://trac.torproject.org/projects/tor/ticket/34381 >, these
contrib scripts were generated by older versions of Tor and shellcheck
will throw warnings if they still exist.
2020-06-08 01:41:36 +00:00
Nick Mathewson
1d32c3114f
Merge branch 'maint-0.4.3'
2020-06-05 12:37:30 -04:00
Nick Mathewson
754d4e9a17
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-06-05 12:37:29 -04:00
Nick Mathewson
1930828957
Merge branch 'maint-0.3.5' into maint-0.4.2
2020-06-05 12:37:29 -04:00
Alexander Færøy
c1add51bcc
Update and upgrade Pacman before installing dependencies in AppVeyor.
...
This patch makes sures that AppVeyor upgrades its Pacman (the package
manager) before installing the Tor dependencies.
See: https://bugs.torproject.org/34384
2020-06-05 12:37:08 -04:00
Nick Mathewson
f548f1475b
Merge remote-tracking branch 'tor-github/pr/1920/head'
2020-06-05 10:12:00 -04:00
Nick Mathewson
1fb9be5396
Merge remote-tracking branch 'tor-github/pr/1902/head'
2020-06-05 10:08:27 -04:00
c
5ba7d494c5
Remove tor.sh from .gitignore
...
The files contrib/dist/tor.sh and contrib/dist/suse/tor.sh should not
exist anymore, but when building in same repository for older versions
of Tor, these files may return and not be cleaned up properly. This
commit unignores those files from .gitignore, in order to make it clear
that these files are no longer auto-generated and should be cleaned up.
2020-06-05 10:28:29 +00:00