Commit Graph
35579 Commits
Author SHA1 Message Date
Alexander Færøy 21cf91ee2c Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-30 13:37:20 +00:00
Alexander Færøy c57896a76e Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-30 13:37:20 +00:00
Alexander Færøy b0bfee8c78 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-06-30 13:37:20 +00:00
Alexander Færøy bebdd2888f Merge remote-tracking branch 'nickm-github/bug32884_035' into maint-0.3.5 2020-06-30 13:35:13 +00:00
Nick Mathewson feddba6f8b Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 13:57:50 -04:00
Nick Mathewson eef77227ef Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-29 13:57:41 -04:00
Nick Mathewson d235e523d5 Merge branch 'ticket33290_v2_042' into maint-0.4.2 2020-06-29 13:57:13 -04:00
Nick Mathewson b2ce815bd8 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 13:56:16 -04:00
Nick Mathewson d124cfc058 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-29 13:56:04 -04:00
Nick Mathewson a692b87f82 Merge remote-tracking branch 'tor-github/pr/1696/head' into maint-0.4.2 2020-06-29 13:53:27 -04:00
Nick Mathewson 9e85515f83 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 13:48:32 -04:00
Nick Mathewson 31bdfd4920 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-29 13:48:32 -04:00
Nick Mathewson 0575a182a6 Merge remote-tracking branch 'tor-github/pr/1697/head' into maint-0.4.2 2020-06-29 13:48:25 -04:00
Nick Mathewson 6fb31bb34a Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 12:58:50 -04:00
Nick Mathewson f862971d04 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-29 12:58:50 -04:00
Nick Mathewson 216456299f Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2 2020-06-29 12:58:23 -04:00
Nick Mathewson 41a4243901 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 12:56:50 -04:00
Nick Mathewson 3008255aea Merge remote-tracking branch 'tor-github/pr/1829/head' into maint-0.4.3 2020-06-29 12:56:39 -04:00
Nick Mathewson fd8ce812b0 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-06-29 12:55:35 -04:00
Nick Mathewson 2c61f22e43 Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-29 12:55:35 -04:00
Nick Mathewson 183d0d30d6 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-06-29 12:55:35 -04:00
Nick Mathewson 0c0214bcc0 Merge remote-tracking branch 'tor-github/pr/1725/head' into maint-0.3.5 2020-06-29 12:55:27 -04:00
George Kadianakis 68d848e244 Reinstate support for GUARD NEW/UP/DOWN control port events. 2020-06-23 19:48:37 +03:00
Nick Mathewson 318753f502 Merge branch 'ticket34382' into maint-0.4.4 2020-06-23 12:29:39 -04:00
David Goulet 5232315168 Merge branch 'tor-github/pr/1937' into maint-0.4.4 2020-06-23 08:52:16 -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 93d582b8e9 Bump to 0.4.4.1-alpha-dev 2020-06-16 19:38:38 -04:00
Nick Mathewson 148291a52e Bump to 0.4.4.1-alpha 2020-06-15 16:45: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
David Goulet 0f218a05a6 Merge branch 'maint-0.3.5' into maint-0.4.2 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 75734f48aa Merge branch 'maint-0.4.3' into maint-0.4.4 2020-06-12 12:55:41 -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 KadianakisandFlorentin Rochet 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 KadianakisandFlorentin Rochet 755b8252a4 Fix and update unittests.
Co-authored-by: Florentin Rochet <florentin.rochet@uclouvain.be>
2020-06-11 16:13:20 +03:00
George KadianakisandFlorentin Rochet 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 KadianakisandFlorentin Rochet 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
Nick Mathewson fc16dbf7aa Remove "enable_practracker_in_hooks" for 0.4.4. 2020-06-09 15:47:25 -04: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 1930828957 Merge branch 'maint-0.3.5' into maint-0.4.2 2020-06-05 12:37:29 -04:00
Nick Mathewson 754d4e9a17 Merge branch 'maint-0.4.2' into maint-0.4.3 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
rl1987 3e4814edeb Fix some checks of tor_inet_ntoa() return value
Also, fix a format string.
2020-06-05 11:49:24 +03:00