torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 29842f68e7 Merge remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1 Nick Mathewson 2019-06-11 08:41:48 -04:00
  • a15ec8bf84 circpad: some more logging changes. George Kadianakis 2019-06-11 14:28:38 +03:00
  • a7986755ee Merge branch 'tor-github/pr/1060' George Kadianakis 2019-06-11 14:12:22 +03:00
  • e5ad6fb092 Merge branch 'ticket30769_041_01' George Kadianakis 2019-06-11 14:11:24 +03:00
  • c1359b32a4 trunnel: Rename sendme.trunnel to sendme_cell.trunnel David Goulet 2019-06-05 09:57:52 -04:00
  • 646f7a9a94 Merge branch 'ticket30687_042_01' George Kadianakis 2019-06-11 14:02:33 +03:00
  • 7cf9d54e6d token-bucket: Implement a single counter object David Goulet 2019-05-29 11:34:07 -04:00
  • b83dba7cb0 Merge branch 'maint-0.4.1' George Kadianakis 2019-06-11 13:48:16 +03:00
  • eab9dc06af Merge branch 'tor-github/pr/1065' into maint-0.4.1 George Kadianakis 2019-06-11 13:48:10 +03:00
  • ece5133e0d Merge branch 'tor-github/pr/1098' George Kadianakis 2019-06-11 13:19:43 +03:00
  • bff42c86cd changes: file for 30799 teor 2019-06-11 15:15:19 +10:00
  • 024d65e14e Free a string buffer in nt_service_install() Xiaoyin Liu 2019-06-07 17:13:49 +08:00
  • e9f1e975df Merge branch 'maint-0.4.1' teor 2019-06-11 14:52:40 +10:00
  • 2779ce1f6f Merge branch 'maint-0.4.0' into maint-0.4.1 teor 2019-06-11 14:52:36 +10:00
  • 50dcbf2612 Merge branch 'maint-0.4.0' into release-0.4.0 teor 2019-06-11 14:52:32 +10:00
  • 4ca18fde93 Merge branch 'maint-0.3.5' into maint-0.4.0 teor 2019-06-11 14:52:27 +10:00
  • eb7f55df88 Merge branch 'maint-0.3.5' into release-0.3.5 teor 2019-06-11 14:52:23 +10:00
  • dcb8cad4e6 Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5 teor 2019-06-11 14:51:46 +10:00
  • a742a80eea Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5 teor 2019-06-11 14:51:37 +10:00
  • 202ccc3930 Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5 teor 2019-06-11 14:48:52 +10:00
  • a58c4cc6dd Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5 teor 2019-06-11 14:47:40 +10:00
  • cb20054ccd Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5 teor 2019-06-11 14:46:24 +10:00
  • 396134188f Stop hard-coding env vars in the git scripts teor 2019-06-11 14:34:44 +10:00
  • 973800b847 scripts/git: Stop hard-coding the bash path in the git scripts teor 2019-06-11 14:29:10 +10:00
  • cfa943f140 Merge branch 'maint-0.4.1' Nick Mathewson 2019-06-10 18:44:31 -04:00
  • 66c3077516 Merge branch 'maint-0.4.0' into release-0.4.0 Nick Mathewson 2019-06-10 18:44:31 -04:00
  • 5b07ff4011 Merge branch 'maint-0.4.0' into maint-0.4.1 Nick Mathewson 2019-06-10 18:44:31 -04:00
  • c8447f95ec Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0 Nick Mathewson 2019-06-10 18:44:20 -04:00
  • d6b411a351 Merge branch 'maint-0.4.1' Nick Mathewson 2019-06-10 18:33:26 -04:00
  • 0fe3b373ac Merge branch 'maint-0.4.0' into release-0.4.0 Nick Mathewson 2019-06-10 18:33:26 -04:00
  • 6a72cc2598 Merge branch 'maint-0.4.0' into maint-0.4.1 Nick Mathewson 2019-06-10 18:33:26 -04:00
  • c8e09dd0d2 Merge branch 'maint-0.4.1' Nick Mathewson 2019-06-10 18:31:36 -04:00
  • c0285320df Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1 Nick Mathewson 2019-06-10 18:31:23 -04:00
  • df8e2bbc0f Merge remote-tracking branch 'tor-github/pr/1038' Nick Mathewson 2019-06-10 09:38:40 -04:00
  • 1190636f24 Merge branch 'maint-0.4.1' Nick Mathewson 2019-06-10 09:37:28 -04:00
  • 765e4364d9 Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1 Nick Mathewson 2019-06-10 09:37:17 -04:00
  • 0635170cf1 Add an environment variable to set GIT_PATH in git scripts Nick Mathewson 2019-06-10 09:05:26 -04:00
  • bbddda3a18 push-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCH Nick Mathewson 2019-06-10 08:56:26 -04:00
  • 46da530431 Update git scripts for new versions Nick Mathewson 2019-06-10 08:54:22 -04:00
  • adc7b50eae Bump master to 0.4.2.0-alpha-dev Nick Mathewson 2019-06-10 08:47:33 -04:00
  • b9041e8a63 test: fix a typo in test_rebind.sh teor 2019-06-10 20:56:40 +10:00
  • 430dd2da6e Merge branch 'bug30713_035' into bug30713_040 teor 2019-06-10 20:50:53 +10:00
  • be0a4be276 Travis: Skip test_rebind on macOS builds teor 2019-06-10 18:59:02 +10:00
  • d761c3ca6d Travis: allow the test-stem job to fail teor 2019-06-10 19:18:35 +10:00
  • c46e99c43c Tolerate net-unreachable failures in util/socketpair_ersatz Nick Mathewson 2019-06-07 13:52:03 -04:00
  • ecc5feff38 bump to 0.4.1.2-alpha-dev Nick Mathewson 2019-06-06 08:28:34 -04:00
  • 6be9d3aed8 practracker: accept one extra line in routerlist.c teor 2019-06-06 18:24:17 +10:00
  • 19bf5806ad dirauth: Return a distinct status when formatting annotations fails teor 2019-06-06 08:52:13 +10:00
  • a4ea335a69 dirauth: Fix some comments in the router status processing code. teor 2019-06-06 08:45:57 +10:00
  • b07b1a4f6d practracker: accept 3 extra lines in router_parse_entry_from_string() teor 2019-06-06 13:42:30 +10:00
  • c7fc53c2e7 Merge branch 'bug30781_040' into bug30781_master teor 2019-06-06 09:57:31 +10:00
  • fb3f461406 Merge branch 'bug30781_035' into bug30781_040 teor 2019-06-06 09:56:50 +10:00
  • c8c2e2b8fc Merge branch 'bug30781_034' into bug30781_035 teor 2019-06-06 09:55:44 +10:00
  • dc8e3cd5ce Merge branch 'bug30781_029' into bug30781_034 teor 2019-06-06 09:53:02 +10:00
  • ba83c1e5cf dirparse: Stop crashing when parsing unknown descriptor purpose annotations teor 2019-06-06 09:12:14 +10:00
  • 463ded569c Merge branch 'maint-0.4.0' into release-0.4.0 Nick Mathewson 2019-06-05 16:24:10 -04:00
  • 3c2b2f072f Merge branch 'maint-0.4.0' tor-0.4.1.2-alpha Nick Mathewson 2019-06-05 16:24:10 -04:00
  • 6a6f7eb671 Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0 Nick Mathewson 2019-06-05 16:22:52 -04:00
  • d63c17f2af Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0 Nick Mathewson 2019-06-05 16:22:29 -04:00
  • e51b57ee04 Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0 Nick Mathewson 2019-06-05 16:16:34 -04:00
  • 04cb2d4010 Merge remote-tracking branch 'tor-github/pr/741' into maint-0.4.0 Nick Mathewson 2019-06-05 16:14:51 -04:00
  • 2300a619a5 Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.4.0 Nick Mathewson 2019-06-05 16:13:53 -04:00
  • 851e881f01 Merge remote-tracking branch 'tor-github/pr/971' into maint-0.4.0 Nick Mathewson 2019-06-05 16:12:07 -04:00
  • a56d7e37aa Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.4.0 Nick Mathewson 2019-06-05 16:10:51 -04:00
  • a6399da598 Bug 29034: Cleanup hs circuitmap when purpose changes. Mike Perry 2019-06-05 11:50:44 -07:00
  • 30f0e993c9 push release date to tomorrow: too many last minute surprises Nick Mathewson 2019-06-05 15:53:52 -04:00
  • 4ceec4760c change some CI-substitute logic Nick Mathewson 2019-06-05 15:38:25 -04:00
  • 54eb3c043c Merge remote-tracking branch 'tor-github/pr/1076' Nick Mathewson 2019-06-05 15:35:43 -04:00
  • e54ce03b4f More LOG_PROTOCOL_WARN. Mike Perry 2019-06-05 12:33:39 -07:00
  • c525135dac Bug 29034: Cleanup hs circuitmap when purpose changes. Mike Perry 2019-06-05 11:50:44 -07:00
  • 31c34f6524 Revert "hs: Implement a helper to repurpose a circuit" Mike Perry 2019-06-05 11:38:01 -07:00
  • a42131bf48 Revert "test: Add test_hs_circ.c for HS circuit testing" Mike Perry 2019-06-05 11:37:32 -07:00
  • 27e067df4f Add missing newline after decode_intro_points() closing bracket Neel Chauhan 2019-06-05 12:50:01 -04:00
  • 917e4e9eae Don't access rend data after a circuit has been marked for close. George Kadianakis 2019-06-05 18:19:23 +03:00
  • 7f341d6482 minor changelog edits Nick Mathewson 2019-06-05 09:43:43 -04:00
  • 892a313b6a Replace a missing end-of-comment string Nick Mathewson 2019-06-05 09:35:45 -04:00
  • 2926f49b24 Regenerate practracker excpetions file Nick Mathewson 2019-06-05 09:34:14 -04:00
  • 60213a3621 Run "make autostyle." Nick Mathewson 2019-06-05 09:33:35 -04:00
  • d1b02456c1 Bump to 0.4.1.2-alpha Nick Mathewson 2019-06-05 09:25:21 -04:00
  • d2de899bf4 Rewrap the changelog Nick Mathewson 2019-06-05 09:24:42 -04:00
  • 0982d01369 Start a changelog for 0.4.1.2-alpha Nick Mathewson 2019-06-05 09:24:18 -04:00
  • ae490189f8 practracker update Nick Mathewson 2019-06-05 09:06:43 -04:00
  • b39a8d315d Merge remote-tracking branch 'tor-github/pr/1053' Nick Mathewson 2019-06-05 09:04:09 -04:00
  • 0c16ec4c07 Merge branch 'bug30286_2_squashed' Nick Mathewson 2019-06-05 08:32:39 -04:00
  • e8aab46a3a Document TOR_UPSTREAM_REMOTE_NAME env variable rl1987 2019-05-17 19:24:26 +03:00
  • 8cb6b2b9ab Fix typo in #29670 changes file. George Kadianakis 2019-06-05 14:56:28 +03:00
  • 99bf3d8e14 Merge branch 'tor-github/pr/1072' George Kadianakis 2019-06-05 14:40:38 +03:00
  • a63c5f844b Merge branch 'tor-github/pr/1067' David Goulet 2019-06-04 09:57:03 -04:00
  • dc5cdde60c update practracker Nick Mathewson 2019-06-04 08:29:43 -04:00
  • 4022b6d6b7 Merge branch 'bug29670_035' into bug29670_041 Nick Mathewson 2019-06-04 08:29:05 -04:00
  • 33382184b6 sendme: Do not decrement window in a log_debug() David Goulet 2019-06-03 14:31:51 -04:00
  • 180048e013 fix some simple typos Roger Dingledine 2019-06-01 15:37:51 -04:00
  • 5e594831c7 Practracker excpetions. Nick Mathewson 2019-05-31 12:41:44 -04:00
  • fd8beab4dd Merge branch 'bug29875_035' into bug29875_master Nick Mathewson 2019-05-31 12:40:43 -04:00
  • c09e7a4e71 changes file for bug 29875. Nick Mathewson 2019-05-31 12:39:52 -04:00
  • 8015979eeb num_bridges_usable(): only count configured bridges. Nick Mathewson 2019-05-31 12:19:29 -04:00
  • 5b3c886584 Consider dir info to have changed when the bridges change Nick Mathewson 2019-05-31 11:46:58 -04:00
  • 41b94722e5 test: Add test_hs_circ.c for HS circuit testing David Goulet 2019-05-31 10:43:01 -04:00
  • 3c3158f182 Fix some tests for CL_PORT_NO_STREAM_OPTIONS Nick Mathewson 2019-05-31 09:03:16 -04:00
  • 70b85358af Fix a logic error in deciding whether to accept SessionGroup= Nick Mathewson 2019-05-31 08:26:10 -04:00