Commit Graph

  • e9edcea0ca Merge branch 'tor-gitlab/mr/275' David Goulet 2021-06-29 10:55:46 -04:00
  • 1d808e8b61 Merge branch 'maint-0.4.5' into release-0.4.5 David Goulet 2021-06-29 10:41:36 -04:00
  • 2630e4eea1 Merge branch 'maint-0.4.6' into release-0.4.6 David Goulet 2021-06-29 10:41:36 -04:00
  • 23451ef2fe Merge branch 'maint-0.4.6' David Goulet 2021-06-29 10:41:36 -04:00
  • f2647295c0 Merge branch 'maint-0.4.5' into maint-0.4.6 David Goulet 2021-06-29 10:41:36 -04:00
  • 301ffb71a6 hs: Send back 0xF6 for a v2 onion address David Goulet 2021-06-29 09:56:44 -04:00
  • f944e46399 If TestingTorNetwork, skip perm check on the hs directory Steven Engler 2021-06-28 13:35:11 -04:00
  • fce99957e2 Suppress strict-prototypes warning on NSS pk11pub.h header Nick Mathewson 2021-06-28 09:08:31 -04:00
  • 2b97c1dd34 Merge remote-tracking branch 'tor-gitlab/mr/385' George Kadianakis 2021-06-28 14:11:46 +03:00
  • 9b2a499e12 Merge branch 'maint-0.4.5' into release-0.4.5 Nick Mathewson 2021-06-26 10:04:38 -04:00
  • 8edd19ca72 Merge branch 'maint-0.4.6' into release-0.4.6 Nick Mathewson 2021-06-26 10:04:38 -04:00
  • 45b5987115 Merge branch 'maint-0.4.6' Nick Mathewson 2021-06-26 10:04:38 -04:00
  • 45c8d69cbb Merge branch 'maint-0.4.5' into maint-0.4.6 Nick Mathewson 2021-06-26 10:04:38 -04:00
  • 83483bd4f6 Enable deterministic RNG for address set tests. Alexander Færøy 2021-06-25 16:29:53 +00:00
  • 3abb9180cb Merge branch 'maint-0.4.6' into release-0.4.6 David Goulet 2021-06-18 14:29:15 -04:00
  • 270398fa31 Merge branch 'maint-0.4.6' David Goulet 2021-06-18 14:29:15 -04:00
  • 2c00ad36cd Fix compilation on systems with older compilers. Alexander Færøy 2021-06-10 20:04:13 +00:00
  • 3f73ab3f0d git: Don't pull github anymore in git-pull-all.sh David Goulet 2021-06-16 10:53:32 -04:00
  • d642da020e Merge remote-tracking branch 'tor-gitlab/mr/338' Nick Mathewson 2021-06-14 13:10:18 -04:00
  • 982829650c Merge remote-tracking branch 'tor-gitlab/mr/397' Nick Mathewson 2021-06-14 13:05:03 -04:00
  • ec2094a76e Copy forward ChangeLog and ReleaseNotes from 0.3.5.15, 0.4.4.9, and 0.4.5.9 Nick Mathewson 2021-06-14 11:55:48 -04:00
  • e04831a0d2 Copy the 0.4.6.5 changelog and releasenotes to main. Nick Mathewson 2021-06-14 11:53:12 -04:00
  • 27c3254988 Remove 0.4.4 from list-tor-branches. Nick Mathewson 2021-06-14 11:50:00 -04:00
  • 88b54f2a5b Merge branch 'maint-0.4.4' into release-0.4.4 release-0.4.4 Nick Mathewson 2021-06-14 11:49:01 -04:00
  • f863870398 Merge branch 'maint-0.3.5' into release-0.3.5 Nick Mathewson 2021-06-14 11:49:01 -04:00
  • ecc1e8eacb Merge branch 'maint-0.4.5' into release-0.4.5 Nick Mathewson 2021-06-14 11:49:01 -04:00
  • e18bf39e66 Merge branch 'maint-0.4.6' into release-0.4.6 Nick Mathewson 2021-06-14 11:49:01 -04:00
  • 806bc2442d Merge branch 'maint-0.4.6' Nick Mathewson 2021-06-14 11:48:46 -04:00
  • 91aec8dbc1 Bump to 0.4.6.5-dev Nick Mathewson 2021-06-14 11:48:30 -04:00
  • e04e545173 Merge branch 'maint-0.4.5' into maint-0.4.6 Nick Mathewson 2021-06-14 11:47:54 -04:00
  • 9085508310 Bump to 0.4.5.9-dev Nick Mathewson 2021-06-14 11:47:41 -04:00
  • 5ab97fa603 Merge branch 'maint-0.4.4' into maint-0.4.5 Nick Mathewson 2021-06-14 11:47:29 -04:00
  • 253b83b722 Merge branch 'maint-0.3.5' into maint-0.4.4 maint-0.4.4 Nick Mathewson 2021-06-14 11:46:20 -04:00
  • 87492154e0 Bump to 0.3.5.15-dev Nick Mathewson 2021-06-14 11:45:30 -04:00
  • d0ed04d50e Copy ChangeLog into ReleaseNotes. tor-0.4.5.9 Nick Mathewson 2021-06-14 10:51:06 -04:00
  • dbe8cd3642 Copy ChangeLog into ReleaseNotes. tor-0.4.4.9 Nick Mathewson 2021-06-14 10:51:02 -04:00
  • b925cef1e3 Copy ChangeLog into ReleaseNotes. tor-0.3.5.15 Nick Mathewson 2021-06-14 10:50:47 -04:00
  • 7034c8449d Implement fuzzing for superencrypted HSv3 desc layer George Kadianakis 2021-06-11 01:55:20 +03:00
  • fc2582f203 Pick a date, draft a blurb Nick Mathewson 2021-06-10 13:19:55 -04:00
  • 9159538348 Pick a date, draft a blurb Nick Mathewson 2021-06-10 13:19:48 -04:00
  • 6abafc1018 Pick a date, draft a blurb Nick Mathewson 2021-06-10 13:19:43 -04:00
  • 62a500dd1d Pick a date, draft a blurb tor-0.4.6.5 Nick Mathewson 2021-06-10 13:17:19 -04:00
  • 31b55c14ca Backport changelog entries Nick Mathewson 2021-06-10 13:14:29 -04:00
  • 292865b894 Backport changelog entries Nick Mathewson 2021-06-10 13:14:11 -04:00
  • 5f710eb087 Backport changelog entries Nick Mathewson 2021-06-10 13:13:54 -04:00
  • 15b0980bd7 Fold entries into changelog and releasenotes Nick Mathewson 2021-06-10 13:13:29 -04:00
  • ec677c0c2e Merge branch 'maint-0.4.6' Nick Mathewson 2021-06-10 12:30:30 -04:00
  • e2138627f9 Merge branch 'maint-0.3.5' into release-0.3.5 Nick Mathewson 2021-06-10 12:30:29 -04:00
  • 7c07cf1afc Merge branch 'maint-0.4.4' into release-0.4.4 Nick Mathewson 2021-06-10 12:30:29 -04:00
  • 1451861cd2 Merge branch 'maint-0.4.5' into release-0.4.5 Nick Mathewson 2021-06-10 12:30:29 -04:00
  • 58ad0302ea Merge branch 'maint-0.4.6' into release-0.4.6 Nick Mathewson 2021-06-10 12:30:29 -04:00
  • 8e590992c4 Merge branch 'maint-0.4.5' into maint-0.4.6 Nick Mathewson 2021-06-10 12:30:29 -04:00
  • 200e9a55e0 Merge branch 'maint-0.4.4' into maint-0.4.5 Nick Mathewson 2021-06-10 12:30:29 -04:00
  • 0ae9fd62fd Merge branch 'maint-0.3.5' into maint-0.4.4 Nick Mathewson 2021-06-10 12:30:11 -04:00
  • f57b5c48e0 Fix TROVE-2021-006: Out-of-bounds read on v3 desc parsing George Kadianakis 2021-05-18 17:06:57 +03:00
  • 0667eaa9bf Merge branch 'maint-0.4.6' Nick Mathewson 2021-06-10 09:55:55 -04:00
  • 27a8bac500 Merge branch 'maint-0.4.4' into release-0.4.4 Nick Mathewson 2021-06-10 09:55:55 -04:00
  • 5e04311873 Merge branch 'maint-0.4.5' into release-0.4.5 Nick Mathewson 2021-06-10 09:55:55 -04:00
  • 5481412cd7 Merge branch 'maint-0.4.6' into release-0.4.6 Nick Mathewson 2021-06-10 09:55:55 -04:00
  • 7be37a26ac Merge branch 'maint-0.4.5' into maint-0.4.6 Nick Mathewson 2021-06-10 09:55:55 -04:00
  • ae2254e490 Merge branch 'maint-0.4.4' into maint-0.4.5 Nick Mathewson 2021-06-10 09:55:55 -04:00
  • 014345ed6a Resolve remaining merge conflicts in relay.c Nick Mathewson 2021-06-10 09:55:35 -04:00
  • b5eb1ba722 Merge branch 'maint-0.3.5' into release-0.3.5 Nick Mathewson 2021-06-10 08:53:07 -04:00
  • 8734eea31b Merge branch 'maint-0.4.6' Nick Mathewson 2021-06-10 08:53:07 -04:00
  • 096644038c Merge branch 'maint-0.4.4' into release-0.4.4 Nick Mathewson 2021-06-10 08:53:07 -04:00
  • e4ca6427e1 Merge branch 'maint-0.4.5' into release-0.4.5 Nick Mathewson 2021-06-10 08:53:07 -04:00
  • a2b0d7ead4 Merge branch 'maint-0.4.6' into release-0.4.6 Nick Mathewson 2021-06-10 08:53:07 -04:00
  • 3260d323a6 Merge branch 'maint-0.4.5' into maint-0.4.6 Nick Mathewson 2021-06-10 08:53:07 -04:00
  • ec696a95e5 Merge branch 'maint-0.4.4' into maint-0.4.5 Nick Mathewson 2021-06-10 08:53:07 -04:00
  • 0f2d45328d Merge branch 'maint-0.3.5' into maint-0.4.4 Nick Mathewson 2021-06-10 08:52:39 -04:00
  • adb248b6d6 TROVE-2021-003: Check layer_hint before half-closed end and resolve cells David Goulet 2021-06-03 09:33:21 -04:00
  • d9edf143ab Merge branch 'maint-0.4.6' Nick Mathewson 2021-06-10 08:42:15 -04:00
  • 15617f29cb Merge branch 'maint-0.4.4' into release-0.4.4 Nick Mathewson 2021-06-10 08:42:15 -04:00
  • 436c18510f Merge branch 'maint-0.4.5' into release-0.4.5 Nick Mathewson 2021-06-10 08:42:15 -04:00
  • f6ebe8b920 Merge branch 'maint-0.4.6' into release-0.4.6 Nick Mathewson 2021-06-10 08:42:15 -04:00
  • 69bd4a8a2d Merge branch 'maint-0.4.5' into maint-0.4.6 Nick Mathewson 2021-06-10 08:42:15 -04:00
  • 1da8621c0a Merge branch 'maint-0.4.4' into maint-0.4.5 Nick Mathewson 2021-06-10 08:42:15 -04:00
  • 31eaa81f59 Merge branch 'maint-0.3.5' into maint-0.4.4 Nick Mathewson 2021-06-10 08:42:15 -04:00
  • 62128193e2 Merge branch 'maint-0.3.5' into release-0.3.5 Nick Mathewson 2021-06-10 08:42:14 -04:00
  • d71bf986b4 Merge branch 'bug40391_035' into maint-0.3.5 Nick Mathewson 2021-06-10 08:41:59 -04:00
  • 085bf61a35 Merge branch 'maint-0.4.6' Nick Mathewson 2021-06-10 08:37:34 -04:00
  • aa4da024ad Merge branch 'maint-0.4.4' into release-0.4.4 Nick Mathewson 2021-06-10 08:37:34 -04:00
  • be54257cf9 Merge branch 'maint-0.4.5' into release-0.4.5 Nick Mathewson 2021-06-10 08:37:34 -04:00
  • c58c2d4e37 Merge branch 'maint-0.4.6' into release-0.4.6 Nick Mathewson 2021-06-10 08:37:34 -04:00
  • aceda67546 Merge branch 'maint-0.3.5' into release-0.3.5 Nick Mathewson 2021-06-10 08:37:34 -04:00
  • 1d11675adb Merge branch 'maint-0.4.5' into maint-0.4.6 Nick Mathewson 2021-06-10 08:37:34 -04:00
  • e2d01aac9e Merge branch 'maint-0.4.4' into maint-0.4.5 Nick Mathewson 2021-06-10 08:37:34 -04:00
  • 7c19a4d924 Merge branch 'maint-0.3.5' into maint-0.4.4 Nick Mathewson 2021-06-10 08:37:26 -04:00
  • 7fdfc2ea54 Merge branch 'bug40390_035_squashed' into maint-0.3.5 Nick Mathewson 2021-06-10 08:34:25 -04:00
  • c0aa9e0a1b Assert on _all_ failures from RAND_bytes(). Nick Mathewson 2021-05-17 08:50:01 -04:00
  • c5922244e2 Merge branch 'maint-0.3.5' into release-0.3.5 Nick Mathewson 2021-06-10 08:32:12 -04:00
  • 9ceb2c317b Merge remote-tracking branch 'tor-gitlab/mr/386' into maint-0.3.5 Nick Mathewson 2021-06-10 08:31:54 -04:00
  • a2e500f1ff Merge branch 'maint-0.4.6' Nick Mathewson 2021-06-10 08:21:49 -04:00
  • 0e2d413d2e Merge branch 'maint-0.4.4' into release-0.4.4 Nick Mathewson 2021-06-10 08:21:48 -04:00
  • 5dd45ccffc Merge branch 'maint-0.4.5' into release-0.4.5 Nick Mathewson 2021-06-10 08:21:48 -04:00
  • 9e5e584cb6 Merge branch 'maint-0.4.6' into release-0.4.6 Nick Mathewson 2021-06-10 08:21:48 -04:00
  • cb38219664 Merge branch 'maint-0.4.5' into maint-0.4.6 Nick Mathewson 2021-06-10 08:21:48 -04:00
  • d60f8fe98a Merge branch 'maint-0.4.4' into maint-0.4.5 Nick Mathewson 2021-06-10 08:21:48 -04:00
  • d6e2516031 Merge branch 'maint-0.3.5' into release-0.3.5 Nick Mathewson 2021-06-10 08:21:47 -04:00
  • 57a41348ee Merge branch 'maint-0.3.5' into maint-0.4.4 Nick Mathewson 2021-06-10 08:21:47 -04:00