Commit Graph

  • 4a7fcc7361 Merge branch 'maint-0.4.5' into release-0.4.5 David Goulet 2021-02-12 12:57:18 -05:00
  • c1b5e7fa1b Merge branch 'maint-0.4.5' David Goulet 2021-02-12 12:57:18 -05:00
  • bdca475518 Merge branch 'tor-gitlab/mr/302' into maint-0.4.5 David Goulet 2021-02-12 12:56:15 -05:00
  • 73bedcaf4d Merge branch 'tor-gitlab/mr/303' into maint-0.4.5 David Goulet 2021-02-12 12:54:52 -05:00
  • 8e493f321a Merge branch 'maint-0.4.5' into release-0.4.5 Alexander Færøy 2021-02-12 15:23:34 +00:00
  • e6caf7d8c7 Merge branch 'maint-0.4.5' Alexander Færøy 2021-02-12 15:23:34 +00:00
  • d24a6b2f75 Merge remote-tracking branch 'tor-gitlab/mr/293' into maint-0.4.5 Alexander Færøy 2021-02-12 15:23:02 +00:00
  • 14bd196eb8 Merge branch 'maint-0.4.5' into release-0.4.5 George Kadianakis 2021-02-12 13:54:18 +02:00
  • 9b6b1aedcd Merge branch 'maint-0.4.5' George Kadianakis 2021-02-12 13:54:18 +02:00
  • 088a74aaab Merge remote-tracking branch 'tor-gitlab/mr/294' into maint-0.4.5 George Kadianakis 2021-02-12 13:53:45 +02:00
  • fe32ac926e Merge branch 'maint-0.4.5' into release-0.4.5 George Kadianakis 2021-02-12 13:50:36 +02:00
  • 9fbedc74c3 Merge branch 'maint-0.4.5' George Kadianakis 2021-02-12 13:50:36 +02:00
  • 726d62947c Merge remote-tracking branch 'tor-gitlab/mr/295' into release-0.4.5 George Kadianakis 2021-02-12 13:49:43 +02:00
  • 58b5300f44 Merge remote-tracking branch 'tor-gitlab/mr/295' into maint-0.4.5 George Kadianakis 2021-02-12 13:44:03 +02:00
  • 80b33ae1ca config: Set flag for implicit port address David Goulet 2021-02-11 16:12:59 -05:00
  • ae5800cd9f relay: Allow RFC1918 addresses for non public relays David Goulet 2021-02-10 11:46:32 -05:00
  • 5138a9c3c2 relay: Don't look at omit flag when building descriptor David Goulet 2021-02-10 11:06:52 -05:00
  • b64fe4bf55 Fix coverity warnings 1472846 / 1472845. George Kadianakis 2021-02-09 18:50:20 +02:00
  • 3d03016eb0 Merge branch 'maint-0.4.5' into release-0.4.5 Nick Mathewson 2021-02-08 14:31:13 -05:00
  • 14e1c2fe0a Merge branch 'maint-0.4.5' Nick Mathewson 2021-02-08 14:31:13 -05:00
  • 758000aa98 Merge remote-tracking branch 'tor-gitlab/mr/296' into maint-0.4.5 Nick Mathewson 2021-02-08 14:30:11 -05:00
  • f96acf79f4 Merge branch 'maint-0.4.5' into release-0.4.5 Nick Mathewson 2021-02-08 14:28:19 -05:00
  • d6b82d79dc Merge branch 'maint-0.4.5' Nick Mathewson 2021-02-08 14:28:19 -05:00
  • 01c4abc2d4 conn: Properly close MetricsPort socket on EOF David Goulet 2021-01-27 09:34:34 -05:00
  • 0efc1e6372 40274: Add a changes file and make the same change with FD_CLOEXEC Nick Mathewson 2021-02-08 12:39:12 -05:00
  • d21ad8a78d Merge remote-tracking branch 'tor-github/pr/2128/head' Nick Mathewson 2021-02-08 12:14:58 -05:00
  • 56f1cab9c1 Don't log supported-protover warnings if consensus is older than Tor. Nick Mathewson 2021-02-08 11:52:53 -05:00
  • 685c4866ac relay: Look at the omit IPv6 flag when publishing David Goulet 2021-02-08 11:51:45 -05:00
  • 8d80126eee Remove DirCache=1 from list of supported versions. Nick Mathewson 2021-02-08 11:40:35 -05:00
  • 841ee4641e relay: Fix Coverity warning for unchecked returned value David Goulet 2021-02-08 11:09:29 -05:00
  • 576e248bc2 Merge remote-tracking branch 'tor-gitlab/mr/278' Nick Mathewson 2021-02-08 10:44:58 -05:00
  • 90add50550 Merge branch 'bug40249_squashed' Nick Mathewson 2021-02-08 10:31:30 -05:00
  • d159bdb0f4 Add a colon to ticket40249 changes entry Nick Mathewson 2021-02-08 10:31:18 -05:00
  • 2391c60c5c Add stream ID to ADDRMAP control event Neel Chauhan 2021-01-19 14:51:00 -08:00
  • 177b535e72 Another round of unittest massaging for tor!212. George Kadianakis 2021-02-08 15:54:48 +02:00
  • 16915ec515 Fix broken unittest from tor!212 . George Kadianakis 2021-02-08 15:30:50 +02:00
  • d4255253b0 Merge remote-tracking branch 'tor-gitlab/mr/212' George Kadianakis 2021-02-08 13:03:07 +02:00
  • a9e3f73d67 Merge branch 'maint-0.4.4' into release-0.4.4 Alexander Færøy 2021-02-05 19:19:34 +00:00
  • 1e9ad700a1 Merge branch 'maint-0.4.5' into release-0.4.5 Alexander Færøy 2021-02-05 19:19:34 +00:00
  • 60823d261c Merge branch 'maint-0.4.5' Alexander Færøy 2021-02-05 19:19:34 +00:00
  • f420eacf18 Merge branch 'maint-0.4.4' into maint-0.4.5 Alexander Færøy 2021-02-05 19:18:47 +00:00
  • 49c61c1bb8 Delete changes/40241_v2 as it breaks CI. Alexander Færøy 2021-02-05 19:18:13 +00:00
  • d9bfe60561 Merge branch 'maint-0.4.4' into release-0.4.4 Alexander Færøy 2021-02-05 17:40:25 +00:00
  • ef0de1c0b2 Merge branch 'maint-0.4.5' into release-0.4.5 Alexander Færøy 2021-02-05 17:40:25 +00:00
  • db207329c7 Merge branch 'maint-0.4.5' Alexander Færøy 2021-02-05 17:40:25 +00:00
  • 4f4728a004 Merge branch 'maint-0.4.4' into maint-0.4.5 Alexander Færøy 2021-02-05 17:40:25 +00:00
  • aa1a053d55 Fix CI build: practracker error in connection_edge.c, take two. Alexander Færøy 2021-02-05 17:39:21 +00:00
  • 3929dc3010 Merge branch 'maint-0.4.5' into release-0.4.5 Alexander Færøy 2021-02-05 17:17:05 +00:00
  • 07ca2a8ee9 Merge branch 'maint-0.4.5' Alexander Færøy 2021-02-05 17:17:05 +00:00
  • 3496804827 Merge branch 'maint-0.4.4' into maint-0.4.5 Alexander Færøy 2021-02-05 17:17:05 +00:00
  • 817cf01831 Merge branch 'maint-0.4.4' into release-0.4.4 Alexander Færøy 2021-02-05 17:17:04 +00:00
  • 62b98716ff Fix CI build: practracker error in connection_edge.c. Alexander Færøy 2021-02-05 17:16:05 +00:00
  • af9107aff2 Fix Windows build. Alexander Færøy 2021-02-05 17:12:52 +00:00
  • 33a0e016e0 Merge branch 'maint-0.4.5' into release-0.4.5 Alexander Færøy 2021-02-05 16:05:57 +00:00
  • 7a152997fe Merge branch 'maint-0.4.5' Alexander Færøy 2021-02-05 16:05:57 +00:00
  • 4b332ce62a Merge branch 'maint-0.4.4' into release-0.4.4 Alexander Færøy 2021-02-05 16:05:57 +00:00
  • 0a40892e8c Merge branch 'maint-0.4.4' into maint-0.4.5 Alexander Færøy 2021-02-05 16:05:57 +00:00
  • 6578a3e865 Merge branch 'tor-gitlab/mr/292_squashed' into maint-0.4.4 Alexander Færøy 2021-02-05 16:04:53 +00:00
  • 67aefd5520 Only check for bindable ports if we are unsure if it will fail. Alexander Færøy 2021-02-04 23:11:11 +00:00
  • d103466282 Add missing newline between get_all_possible_sybil() and version_from_platform() Neel Chauhan 2021-02-03 14:07:01 -08:00
  • 9a81e01b25 Merge branch 'maint-0.4.5' into release-0.4.5 Nick Mathewson 2021-02-03 13:39:55 -05:00
  • 306e8f87bc Merge branch 'maint-0.4.4' into release-0.4.4 Nick Mathewson 2021-02-03 13:39:55 -05:00
  • d06dfc0845 Merge branch 'maint-0.4.5' Nick Mathewson 2021-02-03 13:39:55 -05:00
  • 1c5dd021a7 Merge branch 'maint-0.4.3' into release-0.4.3 release-0.4.3 Nick Mathewson 2021-02-03 13:39:54 -05:00
  • fdd4bc3f43 Merge branch 'maint-0.3.5' into release-0.3.5 Nick Mathewson 2021-02-03 13:39:54 -05:00
  • ff1b24fb73 Merge branch 'maint-0.4.4' into maint-0.4.5 Nick Mathewson 2021-02-03 13:39:41 -05:00
  • 2933c37188 Merge branch 'maint-0.4.3' into maint-0.4.4 Nick Mathewson 2021-02-03 13:39:28 -05:00
  • 8a17999da3 Merge branch 'maint-0.3.5' into maint-0.4.3 maint-0.4.3 Nick Mathewson 2021-02-03 13:39:08 -05:00
  • f3ba71bbee bump to 0.4.4.7-dev Nick Mathewson 2021-02-03 13:39:03 -05:00
  • 0d14ac1e0e bump to 0.4.3.8-dev Nick Mathewson 2021-02-03 13:38:56 -05:00
  • 21317c9229 Bump to 0.3.5.13-dev. Nick Mathewson 2021-02-03 13:37:28 -05:00
  • 22f55fdb2a Document REND_V3_AUTH flag Neel Chauhan 2021-02-03 10:25:46 -08:00
  • 14c89e4863 copy stable release entries forward into changelog and releasenotes Nick Mathewson 2021-02-03 12:58:40 -05:00
  • 926432845b copy changelog into releasenotes Nick Mathewson 2021-02-03 12:58:16 -05:00
  • 5232091616 copy changelog into releasenotes Nick Mathewson 2021-02-03 12:58:14 -05:00
  • cd60c6ec6b copy changelog into releasenotes Nick Mathewson 2021-02-03 12:58:07 -05:00
  • 37a32b7ee7 Fold in the entry for 2667 tor-0.4.4.7 Nick Mathewson 2021-02-03 09:53:47 -05:00
  • 5b0fe0ee8a Fold in the entry for 2667 tor-0.4.3.8 Nick Mathewson 2021-02-03 09:53:45 -05:00
  • fc4d507748 Fold in the entry for 2667 tor-0.3.5.13 Nick Mathewson 2021-02-03 09:53:41 -05:00
  • 39ca329573 Merge branch 'maint-0.4.5' into release-0.4.5 David Goulet 2021-02-03 09:35:50 -05:00
  • 22941c5299 Merge branch 'maint-0.4.5' David Goulet 2021-02-03 09:35:50 -05:00
  • 44b4aa82aa nodelist: Remove merge artefact David Goulet 2021-02-03 09:35:45 -05:00
  • 86a55bd02f Merge branch 'maint-0.4.4' into release-0.4.4 David Goulet 2021-02-03 09:11:15 -05:00
  • 6409902e35 Merge branch 'maint-0.4.5' into release-0.4.5 David Goulet 2021-02-03 09:11:15 -05:00
  • 970d49f11b Merge branch 'maint-0.4.5' David Goulet 2021-02-03 09:11:15 -05:00
  • 9e91bb31cc Merge branch 'maint-0.4.4' into maint-0.4.5 David Goulet 2021-02-03 09:11:15 -05:00
  • e51724f857 Merge branch 'maint-0.4.3' into release-0.4.3 David Goulet 2021-02-03 09:11:14 -05:00
  • b9689553d6 Merge branch 'maint-0.3.5' into release-0.3.5 David Goulet 2021-02-03 09:11:14 -05:00
  • 61e38deb56 Merge branch 'maint-0.4.3' into maint-0.4.4 David Goulet 2021-02-03 09:11:14 -05:00
  • 890a9e89ba Merge branch 'maint-0.3.5' into maint-0.4.3 David Goulet 2021-02-03 09:11:14 -05:00
  • f322ea3fa8 Merge branch 'ticket40269_035_01' into maint-0.3.5 David Goulet 2021-02-03 09:11:09 -05:00
  • 6f95cdf87e Remove unused addr_port_set code David Goulet 2021-02-01 12:28:29 -05:00
  • f503f06779 Merge branch 'maint-0.4.5' into release-0.4.5 David Goulet 2021-02-03 08:58:17 -05:00
  • 1b298e1863 Merge branch 'maint-0.4.5' David Goulet 2021-02-03 08:58:17 -05:00
  • a0b3e9116d Merge branch 'maint-0.4.4' into maint-0.4.5 David Goulet 2021-02-03 08:58:02 -05:00
  • dc5e06dfd4 Merge branch 'maint-0.4.4' into release-0.4.4 David Goulet 2021-02-03 08:56:38 -05:00
  • f7f7304c9b Merge branch 'maint-0.4.3' into release-0.4.3 David Goulet 2021-02-03 08:56:38 -05:00
  • c3741d754e Merge branch 'maint-0.3.5' into release-0.3.5 David Goulet 2021-02-03 08:56:38 -05:00
  • eda81ea27e Merge branch 'maint-0.4.3' into maint-0.4.4 David Goulet 2021-02-03 08:56:38 -05:00
  • cc5d5a5d1e Merge branch 'maint-0.3.5' into maint-0.4.3 David Goulet 2021-02-03 08:56:38 -05:00