Commit Graph

  • 8a4635a5fe Merge remote-tracking branch 'tor-github/pr/1081' into maint-0.4.0 teor 2019-08-09 14:05:46 +10:00
  • 654769bcec Merge remote-tracking branch 'tor-github/pr/1080' into maint-0.3.5 teor 2019-08-09 14:05:26 +10:00
  • 1ba2bd3599 Merge remote-tracking branch 'tor-github/pr/1054' into maint-0.3.5 teor 2019-08-09 14:01:50 +10:00
  • e3ba9b7a78 Merge remote-tracking branch 'tor-github/pr/920' into maint-0.3.5 teor 2019-08-09 14:00:01 +10:00
  • 519556ef2c Fix #28525 changes file that is breaking CI. George Kadianakis 2019-03-12 20:11:51 +02:00
  • c35aded00a Fix #28525 changes file that is breaking CI. George Kadianakis 2019-03-12 20:11:51 +02:00
  • 1a9555e283 Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5 teor 2019-08-09 13:53:52 +10:00
  • 45f30ba5fa Merge remote-tracking branch 'tor-github/pr/762' into maint-0.2.9 teor 2019-08-09 13:53:34 +10:00
  • 6205810f8e Merge remote-tracking branch 'tor-github/pr/958' into maint-0.3.5 teor 2019-08-09 13:50:59 +10:00
  • 05018d55ca Merge remote-tracking branch 'tor-github/pr/957' into maint-0.2.9 teor 2019-08-09 13:50:42 +10:00
  • 126d8681e1 Merge branch 'bug31343_31374_041' into bug31343_31374_master teor 2019-08-09 09:51:50 +10:00
  • fb19d13f24 Merge branch 'bug31343_31374_040' into bug31343_31374_041 teor 2019-08-09 09:51:44 +10:00
  • 7502881deb Merge branch 'bug31343_31374_035' into bug31343_31374_040 teor 2019-08-09 09:51:40 +10:00
  • d4184fca30 Merge branch 'bug31343_31374_029' into bug31343_31374_035 teor 2019-08-09 09:51:35 +10:00
  • e609f00342 Merge remote-tracking branch 'tor-github/pr/1211' into test31343_040 teor 2019-08-09 09:50:50 +10:00
  • 65343a966e Merge remote-tracking branch 'tor-github/pr/1222' into combined31343_31374_035 teor 2019-08-09 09:49:35 +10:00
  • 4665ac9ec7 Merge remote-tracking branch 'tor-github/pr/1210' into combined31343_31374_035 teor 2019-08-09 09:49:27 +10:00
  • 2bc8989d83 Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029 teor 2019-08-09 09:48:41 +10:00
  • 7667c1cbaf Merge remote-tracking branch 'tor-github/pr/1209' into combined31343_31374_029 teor 2019-08-09 09:48:28 +10:00
  • a9dab83106 Merge branch 'maint-0.4.1' into release-0.4.1 Nick Mathewson 2019-08-08 15:25:00 -04:00
  • 0e1fd6d61f Merge branch 'maint-0.4.1' Nick Mathewson 2019-08-08 15:25:00 -04:00
  • 53d5b67f07 Merge branch 'ticket31374_035' into maint-0.4.1 Nick Mathewson 2019-08-08 15:24:52 -04:00
  • 2e5519da7c hs: Initialize the INTRO2 bucket for legacy intro point David Goulet 2019-08-08 13:40:10 -04:00
  • 64d2133a61 Move the connection_edge_process_relay_cell() assignments out of if statements in circuit_receive_relay_cell() Neel 2019-08-08 13:05:46 -04:00
  • b47adcbcab Merge branch 'tor-github/pr/1183' David Goulet 2019-08-08 12:30:23 -04:00
  • 0312da75a3 Merge branch 'tor-github/pr/1172' David Goulet 2019-08-08 12:26:59 -04:00
  • b560d94ac0 Merge branch 'ticket31374_029' into ticket31374_035 Nick Mathewson 2019-08-08 11:46:24 -04:00
  • 3a280b35ee Fix a warning about casting the results of GetProcAddress. Nick Mathewson 2019-08-08 11:43:42 -04:00
  • 71e5af0221 pre-push hook: Only run practracker when a special file is present Nick Mathewson 2019-08-08 11:32:11 -04:00
  • 6c83fe996b Merge branch 'maint-0.4.1' into release-0.4.1 Nick Mathewson 2019-08-08 11:24:08 -04:00
  • a8f936c817 Merge branch 'maint-0.4.1' Nick Mathewson 2019-08-08 11:24:08 -04:00
  • 0bc5b7ae95 Merge branch 'ticket31343_040' into maint-0.4.1 Nick Mathewson 2019-08-08 11:23:59 -04:00
  • 7e32db478b Merge branch 'ticket31343_035' into ticket31343_040 Nick Mathewson 2019-08-08 09:40:04 -04:00
  • a4400a77a5 Merge branch 'ticket31343_029' into ticket31343_035 Nick Mathewson 2019-08-08 09:39:48 -04:00
  • 878f440901 Fix another time_t/long warning for 31343. Nick Mathewson 2019-08-08 09:38:03 -04:00
  • 70d0b97ee6 Merge branch 'ticket31343_029' into ticket31343_035 Nick Mathewson 2019-08-08 09:17:23 -04:00
  • cd6cb45372 Restore proper behavior of netinfo skew check Nick Mathewson 2019-08-08 09:15:42 -04:00
  • 320f5068a0 Merge branch 'doc31089_041' into doc31089_master teor 2019-08-08 23:08:19 +10:00
  • fcb4d273fb Merge branch 'doc31089_040' into doc31089_041 teor 2019-08-08 23:07:22 +10:00
  • c3d6c75945 Merge branch 'doc31089_035' into doc31089_040 teor 2019-08-08 23:07:17 +10:00
  • 25f39bdfc4 Merge branch 'doc31089_029' into doc31089_035 teor 2019-08-08 23:07:12 +10:00
  • 1087c48d6e Hardcode the image into tor-exit-notice.html rl1987 2019-07-12 10:16:55 +03:00
  • d6202d3128 scripts/git: add TOR_PUSH_DELAY to git-push-all.sh teor 2019-08-08 12:33:42 +10:00
  • 0acfd7dcee Merge branch 'maint-0.4.1' teor 2019-08-08 11:20:07 +10:00
  • 5c4ec3f335 Merge branch 'maint-0.4.1' into release-0.4.1 teor 2019-08-08 11:20:03 +10:00
  • 40d7f1e3a6 Merge branch 'maint-0.4.0' into maint-0.4.1 teor 2019-08-08 11:19:58 +10:00
  • 88276ee02c Merge branch 'maint-0.4.0' into release-0.4.0 teor 2019-08-08 11:19:50 +10:00
  • 0a661cde1d Merge branch 'maint-0.3.5' into maint-0.4.0 teor 2019-08-08 11:19:38 +10:00
  • cac7c6625f Merge branch 'maint-0.3.5' into release-0.3.5 teor 2019-08-08 11:19:34 +10:00
  • e83eabc9bf Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5 teor 2019-08-08 11:17:46 +10:00
  • 5cbc0b3881 Merge branch 'maint-0.4.1' teor 2019-08-08 11:11:42 +10:00
  • 8ef4c78bd6 Merge branch 'maint-0.4.1' into release-0.4.1 teor 2019-08-08 11:11:38 +10:00
  • 6d0883e9e9 Merge branch 'maint-0.4.0' into maint-0.4.1 teor 2019-08-08 11:11:35 +10:00
  • cac910c42d Merge branch 'maint-0.4.0' into release-0.4.0 teor 2019-08-08 11:11:31 +10:00
  • e27a74b1b1 Merge branch 'maint-0.3.5' into maint-0.4.0 teor 2019-08-08 11:11:27 +10:00
  • 84b84b2430 Merge branch 'maint-0.3.5' into release-0.3.5 teor 2019-08-08 11:11:22 +10:00
  • 1bc2ae7be7 Merge branch 'maint-0.2.9' into maint-0.3.5 teor 2019-08-08 11:10:15 +10:00
  • 97e7be2717 Merge remote-tracking branch 'tor-github/pr/1157' into maint-0.4.0 teor 2019-08-08 11:07:34 +10:00
  • e15b9b1790 Merge remote-tracking branch 'tor-github/pr/1156' into maint-0.3.5 teor 2019-08-08 11:07:11 +10:00
  • 989909145c Merge branch 'maint-0.2.9' into release-0.2.9 teor 2019-08-08 11:05:01 +10:00
  • 8d22c09abf Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9 teor 2019-08-08 10:55:24 +10:00
  • 518b69b57c Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9 teor 2019-08-08 10:54:12 +10:00
  • b4a3e31fea releasenotes: coalesce some sections. Nick Mathewson 2019-08-07 13:49:50 -04:00
  • 766a3396c6 Remove 0.4.1.x bugfixes from 0.4.1 releasenotes Nick Mathewson 2019-08-07 13:47:03 -04:00
  • 941edca160 start on changelog and releasenotes for 0.4.1.5 Nick Mathewson 2019-08-07 13:45:43 -04:00
  • 35cfe2e776 Merge remote-tracking branch 'tor-github/pr/1208' Nick Mathewson 2019-08-07 09:49:49 -04:00
  • 25c97b18f1 changes file for ticket 31320 Nick Mathewson 2019-08-06 13:13:36 -04:00
  • f557680aa9 Merge remote-tracking branch 'tor-github/pr/1203' Nick Mathewson 2019-08-06 13:12:42 -04:00
  • 484b654048 test_token_bucket: negate after casting to signed type. Nick Mathewson 2019-08-06 11:42:04 -04:00
  • 66437710af test_util: Do not check for ENETUNREACH unless it exists. Nick Mathewson 2019-08-06 11:35:50 -04:00
  • 79569d86b3 Merge branch 'ticket31343_035' into ticket31343_040 Nick Mathewson 2019-08-06 11:18:40 -04:00
  • bc9492a938 Merge branch 'ticket31343_029' into ticket31343_035 Nick Mathewson 2019-08-06 11:15:20 -04:00
  • 0849d2a2fd Avoid using labs() on time_t in channeltls.c Nick Mathewson 2019-08-06 11:11:06 -04:00
  • 5a918ced20 Merge branch 'maint-0.4.1' into release-0.4.1 Nick Mathewson 2019-08-06 09:19:11 -04:00
  • 88f9b123d6 Merge branch 'maint-0.4.1' Nick Mathewson 2019-08-06 09:19:11 -04:00
  • 21531f35f3 Merge branch 'ticket31311_041' into maint-0.4.1 Nick Mathewson 2019-08-06 09:19:05 -04:00
  • 2b225aaa77 practracker: Make it happy after rebase David Goulet 2019-08-06 08:01:26 -04:00
  • c45f0b4ec1 hs-v3: Rename HS DoS default defines David Goulet 2019-07-02 07:36:36 -04:00
  • 90b5422e8e test: Series of fixes for hs_dos.c unit tests David Goulet 2019-06-27 14:06:42 -04:00
  • e537968548 dos: Update HS intro circuits if parameters change David Goulet 2019-06-27 13:32:58 -04:00
  • be8bd2a46e hs-v3: Add enable/disable HS DoS introduce parameter David Goulet 2019-06-27 12:58:43 -04:00
  • c5b00c5a51 hs-v3: Add consensus parameters for DoS defenses David Goulet 2019-06-11 08:28:13 -04:00
  • fec0a7b7cb test: Add hs_dos.c unit tests David Goulet 2019-05-30 08:55:40 -04:00
  • 9f738be893 hs: Limit the amount of relayed INTRODUCE2 David Goulet 2019-05-29 14:05:16 -04:00
  • d7afdb3b0f Merge branch 'tor-github/pr/1195' George Kadianakis 2019-08-06 14:51:47 +03:00
  • 4ee65a6f87 Merge branch 'tor-github/pr/1193' David Goulet 2019-08-06 07:42:20 -04:00
  • 0f4b245b20 update exceptions file for depencency violations Nick Mathewson 2019-08-05 17:44:15 -04:00
  • d515b0f4ba changes file for ticket 31176 Nick Mathewson 2019-08-05 17:43:53 -04:00
  • a5971d732e Move include-violation checking into its own function. Nick Mathewson 2019-08-05 17:35:20 -04:00
  • 2a3c727dfe Make includes interface more like the rest of practracker Nick Mathewson 2019-08-05 17:31:49 -04:00
  • 6b26281b50 practracker: a violation of a .may_include rule is now a problem. Nick Mathewson 2019-08-05 17:17:50 -04:00
  • 720951f056 Teach include-checker about advisory rules Nick Mathewson 2019-08-05 17:04:00 -04:00
  • 57c34e80da #31320 Add IPv6 examples Ali Raheem 2019-08-05 19:24:42 +01:00
  • 9abbde2c24 Update pre-commit hook to find checkIncludes in its new location Nick Mathewson 2019-08-05 14:11:51 -04:00
  • 6fb74753c2 Move checkIncludes inside practracker Nick Mathewson 2019-08-05 14:10:40 -04:00
  • 9eb12dde18 checkIncludes: add a real main function and CLI Nick Mathewson 2019-08-05 12:36:13 -04:00
  • 3f4e89a7ab checkIncludes: refactor to use error-iteration style Nick Mathewson 2019-08-05 12:25:41 -04:00
  • 47d9bcfef8 checkIncludes: Separate file-handling from rule-handling Nick Mathewson 2019-08-05 11:58:12 -04:00
  • 65a69f861e checkIncludes.py: extract topological sort code Nick Mathewson 2019-08-05 11:49:52 -04:00
  • 3f35ac772b checkIncludes: introduce rules-file caching. Nick Mathewson 2019-08-05 11:35:13 -04:00