teor
789fdbed05
Merge remote-tracking branch 'tor-github/pr/1065' into maint-0.3.5
2019-08-12 09:52:56 +10:00
teor
a92b05392e
Merge remote-tracking branch 'tor-github/pr/1056' into maint-0.3.5
2019-08-12 09:51:35 +10:00
teor
224825e7ee
Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5
2019-08-12 09:51:00 +10:00
teor
e5be039494
Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5
2019-08-12 09:50:42 +10:00
teor
f65f4b5c38
Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.3.5
2019-08-12 09:49:53 +10:00
teor
8ea0903222
Merge remote-tracking branch 'tor-github/pr/987' into maint-0.3.5
2019-08-12 09:45:32 +10:00
teor
6ed56ee4ea
Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5
2019-08-12 09:44:46 +10:00
teor
2d4772dc47
Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5
2019-08-12 09:43:37 +10:00
teor
ef345ab56d
Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5
2019-08-12 09:42:15 +10:00
teor
9be65c440b
Merge remote-tracking branch 'tor-github/pr/926' into maint-0.3.5
2019-08-12 09:41:14 +10:00
teor
955cf9620c
Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5
2019-08-12 09:40:08 +10:00
teor
3287cae68c
Merge remote-tracking branch 'tor-github/pr/848' into maint-0.3.5
2019-08-12 09:38:46 +10:00
teor
bad0010808
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-10 07:26:21 +10:00
teor
254c1bac45
Merge remote-tracking branch 'tor-github/pr/1078' into maint-0.2.9
2019-08-10 07:21:56 +10:00
teor
e07d08a169
Merge remote-tracking branch 'tor-github/pr/1052' into maint-0.2.9
2019-08-10 07:21:43 +10:00
teor
e0f9a8222b
Merge remote-tracking branch 'tor-github/pr/1229' into maint-0.2.9
2019-08-10 07:21:31 +10:00
teor
8a4635a5fe
Merge remote-tracking branch 'tor-github/pr/1081' into maint-0.4.0
2019-08-09 14:05:46 +10:00
teor
654769bcec
Merge remote-tracking branch 'tor-github/pr/1080' into maint-0.3.5
2019-08-09 14:05:26 +10:00
teor
1ba2bd3599
Merge remote-tracking branch 'tor-github/pr/1054' into maint-0.3.5
2019-08-09 14:01:50 +10:00
teor
e3ba9b7a78
Merge remote-tracking branch 'tor-github/pr/920' into maint-0.3.5
2019-08-09 14:00:01 +10:00
George Kadianakis
519556ef2c
Fix #28525 changes file that is breaking CI.
2019-08-09 13:55:31 +10:00
George Kadianakis
c35aded00a
Fix #28525 changes file that is breaking CI.
2019-08-09 13:55:19 +10:00
teor
1a9555e283
Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5
2019-08-09 13:53:52 +10:00
teor
45f30ba5fa
Merge remote-tracking branch 'tor-github/pr/762' into maint-0.2.9
2019-08-09 13:53:34 +10:00
teor
7502881deb
Merge branch 'bug31343_31374_035' into bug31343_31374_040
2019-08-09 09:51:40 +10:00
teor
e609f00342
Merge remote-tracking branch 'tor-github/pr/1211' into test31343_040
2019-08-09 09:50:50 +10:00
teor
65343a966e
Merge remote-tracking branch 'tor-github/pr/1222' into combined31343_31374_035
2019-08-09 09:49:35 +10:00
teor
4665ac9ec7
Merge remote-tracking branch 'tor-github/pr/1210' into combined31343_31374_035
2019-08-09 09:49:27 +10:00
teor
2bc8989d83
Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029
2019-08-09 09:48:41 +10:00
teor
7667c1cbaf
Merge remote-tracking branch 'tor-github/pr/1209' into combined31343_31374_029
2019-08-09 09:48:28 +10:00
Nick Mathewson
0e1fd6d61f
Merge branch 'maint-0.4.1'
2019-08-08 15:25:00 -04:00
Nick Mathewson
53d5b67f07
Merge branch 'ticket31374_035' into maint-0.4.1
2019-08-08 15:24:52 -04:00
David Goulet
0312da75a3
Merge branch 'tor-github/pr/1172'
2019-08-08 12:26:59 -04:00
Nick Mathewson
b560d94ac0
Merge branch 'ticket31374_029' into ticket31374_035
2019-08-08 11:46:24 -04:00
Nick Mathewson
3a280b35ee
Fix a warning about casting the results of GetProcAddress.
...
Fixes bug 31374; bugfix on 0.2.9.1-alpha.
2019-08-08 11:44:19 -04:00
Nick Mathewson
71e5af0221
pre-push hook: Only run practracker when a special file is present
...
Closes ticket 30979.
2019-08-08 11:36:05 -04:00
Nick Mathewson
a8f936c817
Merge branch 'maint-0.4.1'
2019-08-08 11:24:08 -04:00
Nick Mathewson
0bc5b7ae95
Merge branch 'ticket31343_040' into maint-0.4.1
2019-08-08 11:23:59 -04:00
teor
320f5068a0
Merge branch 'doc31089_041' into doc31089_master
...
Delete outdated comment about serving the image, which had been modified
earlier in the master branch.
2019-08-08 23:08:19 +10:00
teor
fcb4d273fb
Merge branch 'doc31089_040' into doc31089_041
2019-08-08 23:07:22 +10:00
teor
c3d6c75945
Merge branch 'doc31089_035' into doc31089_040
2019-08-08 23:07:17 +10:00
teor
25f39bdfc4
Merge branch 'doc31089_029' into doc31089_035
2019-08-08 23:07:12 +10:00
rl1987
1087c48d6e
Hardcode the image into tor-exit-notice.html
2019-08-08 22:46:51 +10:00
teor
d6202d3128
scripts/git: add TOR_PUSH_DELAY to git-push-all.sh
...
Add a TOR_PUSH_DELAY variable to git-push-all.sh, which makes the script
push master and maint branches with a delay between each branch. These
delays trigger the CI jobs in a set order, which should show the most
likely failures first.
Also:
* make pushes atomic by default, and
* make the script pass any command-line arguments to git push.
Closes ticket 29879.
2019-08-08 18:59:44 +10:00
teor
0acfd7dcee
Merge branch 'maint-0.4.1'
2019-08-08 11:20:07 +10:00
teor
40d7f1e3a6
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-08-08 11:19:58 +10:00
teor
0a661cde1d
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-08 11:19:38 +10:00
teor
e83eabc9bf
Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5
...
Merge changed chutney and stem script lines from 29280 with changed
stem script lines from 30591.
2019-08-08 11:17:46 +10:00
teor
97e7be2717
Merge remote-tracking branch 'tor-github/pr/1157' into maint-0.4.0
2019-08-08 11:07:34 +10:00
teor
e15b9b1790
Merge remote-tracking branch 'tor-github/pr/1156' into maint-0.3.5
2019-08-08 11:07:11 +10:00
teor
8d22c09abf
Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9
2019-08-08 10:55:24 +10:00
teor
518b69b57c
Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9
2019-08-08 10:54:12 +10:00
Nick Mathewson
25c97b18f1
changes file for ticket 31320
2019-08-06 13:13:36 -04:00
Nick Mathewson
79569d86b3
Merge branch 'ticket31343_035' into ticket31343_040
2019-08-06 11:18:40 -04:00
Nick Mathewson
bc9492a938
Merge branch 'ticket31343_029' into ticket31343_035
2019-08-06 11:15:20 -04:00
Nick Mathewson
0849d2a2fd
Avoid using labs() on time_t in channeltls.c
...
On some windows builds, time_t is 64 bits but long is not. This is
causing appveyor builds to fail.
Also, one of our uses of labs() on time_t was logically incorrect:
it was telling us to accept NETINFO cells up to three minutes
_before_ the message they were responding to, which doesn't make
sense.
This patch adds a time_abs() function that we should eventually move
to intmath.h or something. For now, though, it will make merges
easier to have it file-local in channeltls.c.
Fixes bug 31343; bugfix on 0.2.4.4-alpha.
2019-08-06 11:11:06 -04:00
Nick Mathewson
21531f35f3
Merge branch 'ticket31311_041' into maint-0.4.1
2019-08-06 09:19:05 -04:00
George Kadianakis
d7afdb3b0f
Merge branch 'tor-github/pr/1195'
2019-08-06 14:51:47 +03:00
David Goulet
4ee65a6f87
Merge branch 'tor-github/pr/1193'
2019-08-06 07:42:20 -04:00
Nick Mathewson
d515b0f4ba
changes file for ticket 31176
2019-08-05 17:48:06 -04:00
Nick Mathewson
9a1e9b1d6c
Teach practracker about .h files
...
I'm using 500 as a file size limit, and 15 as an include limit.
This affects comparatively few files, but I think they are the worst
ones.
Closes ticket 31175.
2019-08-05 10:31:02 -04:00
Nick Mathewson
54ad92a240
Merge branch 'maint-0.4.1'
2019-08-05 09:59:40 -04:00
George Kadianakis
74c0595965
Ignore regular cells in padding circuits.
...
Padding circuits were regular cells that got closed before their padding
machine could finish. This means that they can still receive regular cells from
their past life, but they have no way or reason to answer them anymore. Hence
let's ignore them before they even get to the proper subsystems.
2019-08-05 13:48:58 +03:00
Nick Mathewson
fa60fee8d5
practracker: Add unit tests to test script, and test script to makefile
...
This makes all of the practracker tests get run by make check, and
hence by our CI.
Closes ticket 31304.
2019-08-01 14:01:43 -04:00
Nick Mathewson
49c696fb46
Merge branch 'ticket31311_041' into ticket31304
2019-08-01 13:48:58 -04:00
Nick Mathewson
3945282419
make dist: only include files from practracker dir intentionally.
...
Previously, we included temporary files and whatnot, which is not
good.
Fixes bug 31311; bugfix on 0.4.1.1-alpha.
2019-08-01 13:47:05 -04:00
Nick Mathewson
223afc2d8f
practracker: add envvar TOR_PRACTRACKER_OPTIONS
...
We have Makefile.am use this to decide how to invoke practracker on
the Tor source.
2019-08-01 12:57:26 -04:00
David Goulet
c4864de573
Merge branch 'tor-github/pr/1177'
2019-08-01 10:18:10 -04:00
Nick Mathewson
19536fd18d
practracker: replaces "overstrict" with "overbroad"
...
I had the logic reversed here.
2019-08-01 09:35:33 -04:00
David Goulet
6dba86d7c9
Merge branch 'maint-0.4.1'
2019-07-29 12:02:54 -04:00
David Goulet
1d6054f750
Merge branch 'tor-github/pr/1179' into maint-0.4.1
2019-07-29 12:02:47 -04:00
David Goulet
044bb019b6
Merge branch 'maint-0.4.1'
2019-07-25 10:27:41 -04:00
George Kadianakis
af26cd6101
Always check the retval of circpad_machine_current_state().
2019-07-25 10:24:23 -04:00
George Kadianakis
bd1ac408d8
Remove dead code from circpad_machine_remove_token().
2019-07-25 10:24:19 -04:00
David Goulet
cfb15d513d
Merge branch 'maint-0.4.1'
2019-07-25 09:03:01 -04:00
David Goulet
2a4b156978
Merge branch 'tor-github/pr/1171' into maint-0.4.1
2019-07-25 09:02:53 -04:00
George Kadianakis
2944b091fc
Merge branch 'maint-0.4.1'
2019-07-24 12:32:06 +03:00
George Kadianakis
bb33a2f290
Merge branch 'tor-github/pr/1181' into maint-0.4.1
2019-07-24 12:31:56 +03:00
George Kadianakis
91f04d006b
Merge branch 'tor-github/pr/1165'
2019-07-24 12:29:57 +03:00
Nick Mathewson
ab1f82ea2a
Merge branch 'ticket24963_042_02'
2019-07-23 14:03:30 -04:00
Nick Mathewson
ab1f39322c
Merge remote-tracking branch 'tor-github/pr/1185'
2019-07-23 12:32:14 -04:00
Nick Mathewson
f6db290e5a
Merge remote-tracking branch 'tor-github/pr/1186'
2019-07-23 12:30:19 -04:00
David Goulet
ef2dd1ba96
Merge branch 'tor-github/pr/1116'
2019-07-23 09:46:29 -04:00
David Goulet
2fce1274de
Merge branch 'tor-github/pr/1153'
2019-07-23 09:43:36 -04:00
David Goulet
f7dc920f4b
Merge branch 'maint-0.4.1'
2019-07-23 09:39:51 -04:00
David Goulet
c541258fac
Merge branch 'tor-github/pr/1158' into maint-0.4.1
2019-07-23 09:39:43 -04:00
George Kadianakis
fdfee3d06f
Changes file for #31113 .
2019-07-23 12:44:43 +03:00
Mike Perry
ec38b662f2
Bug 30649: Changes file.
2019-07-23 12:22:23 +03:00
George Kadianakis
aed82bf410
Add changes file for #31112 and #31098 .
2019-07-23 11:52:25 +03:00
Nick Mathewson
a9379d6750
Set 'routerlist' global to NULL before freeing it.
...
There is other code that uses this value, and some of it is
apparently reachable from inside router_dir_info_changed(), which
routerlist_free() apparently calls. (ouch!) This is a minimal fix
to try to resolve the issue without causing other problems.
Fixes bug 31003. I'm calling this a bugfix on 0.1.2.2-alpha, where
the call to router_dir_info_changed() was added to routerlist_free().
2019-07-19 09:49:52 -04:00
Nick Mathewson
8bbec36b3b
Changes file for bug 31001
2019-07-19 09:21:45 -04:00
Nick Mathewson
97d73db7c3
Changes file for bug 31001
2019-07-19 09:21:08 -04:00
Nick Mathewson
3efe5cc57a
changes file for 30752
2019-07-18 09:28:08 -04:00
Nick Mathewson
78768aafe1
Changes file for 29746.
2019-07-18 09:28:08 -04:00
rl1987
ffce19a9ec
Make tor-print-ed-signing-cert output RFC1123 and unix timestamps as well
2019-07-10 11:36:26 +03:00
Nick Mathewson
09c692e72b
Use a 64-bit mask for log domains, and fix a conflict
...
When we added LD_MESG, we created a conflict with the LD_NO_MOCK
flag. We now need 64 bits for log domains in order to fix this
issue.
Fixes bug 31080; bugfix on 0.4.1.1-alpha.
2019-07-08 13:32:45 -04:00
George Kadianakis
5303dbe624
Merge branch 'tor-github/pr/1152'
2019-07-04 17:14:06 +03:00
David Goulet
ef2123c7c7
hs-v3: Disallow single hop client to post/get a descriptor
...
Closes #24964
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-07-03 08:21:16 -04:00
Nick Mathewson
fdbd139495
Merge remote-tracking branch 'tor-github/pr/1136'
2019-07-02 13:33:50 -04:00
Nick Mathewson
cf92c096ad
Merge remote-tracking branch 'tor-github/pr/1120'
2019-07-02 13:33:37 -04:00
rl1987
59e523f058
Early exit from post-merge git hook script when not merging to master
2019-07-02 20:06:23 +03:00
George Kadianakis
15e28af2d1
Merge remote-tracking branch 'dgoulet/ticket31008_035_01'
2019-07-02 13:19:40 +03:00
Nick Mathewson
c0ea6f9c64
Merge branch 'maint-0.4.1'
2019-07-01 14:25:13 -04:00
Nick Mathewson
2a42d6be27
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-07-01 14:25:12 -04:00
Nick Mathewson
1dd9527897
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-07-01 14:25:12 -04:00
Nick Mathewson
5e16601000
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-07-01 14:25:12 -04:00
teor
7541aaf988
Merge branch 'chutney_ci_v4_040' into chutney_ci_v4_041
2019-07-01 14:36:53 +10:00
teor
7b05f19801
Merge branch 'chutney_ci_v4_035' into chutney_ci_v4_040
...
This merge removes an incorrect comment about the stem version
and commit script.
2019-07-01 14:36:15 +10:00
teor
84f2c0affb
Merge branch 'chutney_ci_v4_029' into chutney_ci_v4_035
2019-07-01 14:33:37 +10:00
Nick Mathewson
75ea7514e1
Add a changes file for coverity test fixes of 31030.
2019-06-28 12:36:53 -04:00
Nick Mathewson
f55598f870
Coverity: different implementation for csiphash
...
Coverity has had trouble figuring out our csiphash implementation,
and has given spurious warnings about its behavior.
This patch changes the csiphash implementation when coverity is in
use, so that coverity can figure out that we are not about to read
beyond the provided input.
Closes ticket 31025.
2019-06-28 12:07:38 -04:00
Nick Mathewson
0fa3dc3228
begin_cell_parse(): Add an assertion to please coverity.
...
Coverity doesn't understand that if begin_cell_parse() returns 0 and
sets is_begindir to 0, its address field will always be set.
Fixes bug 30126; bugfix on 0.2.4.7-alpha; Fixes CID 1447296.
2019-06-28 11:29:51 -04:00
teor
fb977f8cac
changes: file for 28795
...
Replace the 157 fallbacks originally introduced in Tor 0.3.5.6-rc
in December 2018 (of which ~122 were still functional), with a
list of 148 fallbacks (70 new, 78 existing, 79 removed) generated
in June 2019.
Closes ticket 28795.
Note that we created extra lists from DE and US, but they didn't add
any more fallbacks when we tried to merge them.
2019-06-28 21:38:33 +10:00
David Goulet
f446db59e1
man: Fix -help typo to --help
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-27 14:52:12 -04:00
David Goulet
c34a6b922f
Merge branch 'tor-github/pr/1129'
2019-06-27 10:19:45 -04:00
teor
362afa8c4e
doc: update the man page entries for DirAuthority and FallbackDir
...
Improve the documentation for the DirAuthority and FallbackDir torrc
options.
Closes ticket 30955.
2019-06-27 10:19:40 -04:00
Nick Mathewson
da11304136
Merge branch 'maint-0.4.1'
2019-06-26 10:06:02 -04:00
Nick Mathewson
3ccf91027b
Merge remote-tracking branch 'tor-github/pr/1101' into maint-0.4.1
2019-06-26 10:05:51 -04:00
Nick Mathewson
089ef46063
Merge branch 'bug30721_squashed'
2019-06-26 09:57:20 -04:00
teor
adb8538e7b
address/resolve: Require square brackets on IPv6 address:ports
...
When parsing addreses via Tor's internal address:port parsing and
DNS lookup APIs, require IPv6 addresses with ports to have square
brackets.
But allow IPv6 addresses without ports, whether or not they have
square brackets.
Fixes bug 30721; bugfix on 0.2.1.5-alpha.
2019-06-26 09:55:37 -04:00
teor
cd1de99468
resolve: consistently parse IP addresses in square brackets
...
When parsing addreses via Tor's internal DNS lookup API:
* reject IPv4 addresses in square brackets (with or without a port),
* accept IPv6 addresses in square brackets (with or without a port), and
* accept IPv6 addresses without square brackets, as long as they have no port.
This change completes the work started in 23082, making address parsing
consistent between tor's internal DNS lookup and address parsing APIs.
Fixes bug 30721; bugfix on 0.2.1.5-alpha.
2019-06-26 09:55:36 -04:00
Nick Mathewson
0fe9657c8c
Merge remote-tracking branch 'tor-github/pr/1119'
2019-06-26 09:50:00 -04:00
Nick Mathewson
648d5df628
Merge remote-tracking branch 'tor-github/pr/1118' into maint-0.4.1
2019-06-26 09:49:40 -04:00
Nick Mathewson
167dd097e0
Merge remote-tracking branch 'tor-github/pr/1127'
2019-06-26 09:40:01 -04:00
George Kadianakis
72ef4f43d5
Merge branch 'tor-github/pr/1142'
2019-06-26 10:57:24 +03:00
George Kadianakis
7edd01a29b
Merge branch 'tor-github/pr/1109'
2019-06-26 10:56:08 +03:00
George Kadianakis
00acccac64
Merge branch 'tor-github/pr/1114' into maint-0.4.1
2019-06-26 10:51:12 +03:00
Nick Mathewson
e8790971f6
changes file for ticket 30914
2019-06-25 12:51:25 -04:00
Taylor Yu
5612eccef8
Changes file for ticket 30889
2019-06-25 11:42:41 -05:00
Nick Mathewson
3644f4ab5f
Remove changes files that appeared in 0.4.1.3-alpha or earlier.
2019-06-25 11:57:08 -04:00
teor
2663bca392
Merge branch 'bug30958_041' into bug30958_master
2019-06-25 12:29:28 +10:00
Nick Mathewson
c60a85d22a
Add a "typed_var" abstraction to implement lvalue access in C.
...
Right now, this has been done at a high level by confparse.c, but it
makes more sense to lower it.
This API is radically un-typesafe as it stands; we'll be wrapping it
in a safer API as we do #30914 and lower the struct manipulation
code as well.
Closes ticket 30864.
2019-06-24 17:50:43 -04:00
teor
d9f49e9bc1
Merge branch 'bug30958_040' into bug30958_041
2019-06-24 21:31:27 +10:00
teor
e350dfc085
Merge branch 'bug30958_035' into bug30958_040
2019-06-24 21:31:10 +10:00
teor
b7dda83cfa
Merge branch 'bug30958_029' into bug30958_035
2019-06-24 21:30:47 +10:00
teor
5beb32d3d9
stats: Stop removing the ed25519 signature if the extra info file is too big
...
If the signature data was removed, but the keyword was kept, this could
result in an unparseable extra info file.
Fixes bug 30958; bugfix on 0.2.7.2-alpha.
2019-06-24 21:30:03 +10:00
teor
45be44ed9c
stats: Split extrainfo_dump_to_string() into smaller functions.
...
Closes ticket 30956.
2019-06-24 20:47:44 +10:00
teor
872b85e689
Merge branch 'bug30956_041' into bug30956_master
2019-06-24 19:47:34 +10:00
teor
8356cc5b51
stats: Always publish pluggable transports in extra info documents
...
Always publish bridge pluggable transport information in the extra info
descriptor, even if ExtraInfoStatistics is 0. This information is
needed by BridgeDB.
Fixes bug 30956; bugfix on 0.4.1.1-alpha.
2019-06-24 19:44:24 +10:00
rl1987
1d504a408d
Add changes file
2019-06-23 13:38:49 +03:00
David Goulet
f2b1eb1f05
hs: Disallow single hop client circuit when introducing
...
This will effectively also deny any bridge to be used as a single hop to the
introduction point since bridge do not authenticate like clients.
Fixes #24963
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-19 11:17:58 -04:00
David Goulet
8751176687
hs-v3: Close intro circuits when cleaning client cache
...
Fixes #30921
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-19 09:22:07 -04:00
David Goulet
91c7d395cf
changes: Fix typo in changes/ticket30893
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-19 07:50:02 -04:00
David Goulet
e6579d801f
Merge branch 'tor-github/pr/1113'
2019-06-19 07:47:03 -04:00
David Goulet
16a0b7ed67
guard: Ignore marked for close circuit when changing state to open
...
When we consider all circuits in "waiting for guard" state to be promoted to
an "open" state, we were considering all circuits, even the one marked for
close.
This ultiamtely triggers a "circuit_has_opened()" called on the circuit that
is marked for close which then leads to possible undesirable behaviors within
a subsystem.
For instance, the HS subsystem would be unable to find the authentication key
of the introduction point circuit leading to a BUG() warning and a duplicate
mark for close on the circuit.
This commit also adds a unit test to make sure we never select marked for
close circuits when upgrading its guard state from waiting for guard to open.
Fixes #30871
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-19 07:42:30 -04:00
David Goulet
6a0763cd66
guard: Ignore marked for close circuit when changing state to open
...
When we consider all circuits in "waiting for guard" state to be promoted to
an "open" state, we were considering all circuits, even the one marked for
close.
This ultiamtely triggers a "circuit_has_opened()" called on the circuit that
is marked for close which then leads to possible undesirable behaviors within
a subsystem.
For instance, the HS subsystem would be unable to find the authentication key
of the introduction point circuit leading to a BUG() warning and a duplicate
mark for close on the circuit.
This commit also adds a unit test to make sure we never select marked for
close circuits when upgrading its guard state from waiting for guard to open.
Fixes #30871
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-19 07:41:45 -04:00
David Goulet
e3f3478032
guard: Ignore marked for close circuit when changing state to open
...
When we consider all circuits in "waiting for guard" state to be promoted to
an "open" state, we were considering all circuits, even the one marked for
close.
This ultiamtely triggers a "circuit_has_opened()" called on the circuit that
is marked for close which then leads to possible undesirable behaviors within
a subsystem.
For instance, the HS subsystem would be unable to find the authentication key
of the introduction point circuit leading to a BUG() warning and a duplicate
mark for close on the circuit.
This commit also adds a unit test to make sure we never select marked for
close circuits when upgrading its guard state from waiting for guard to open.
Fixes #30871
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-19 07:40:05 -04:00
Nick Mathewson
125a6300da
Merge remote-tracking branch 'tor-github/pr/1115'
2019-06-18 09:10:34 -04:00
Nick Mathewson
93ca08d66c
Merge branch 'ticket29533_squashed'
2019-06-17 08:56:13 -04:00
rl1987
86478be50f
Add changes file
2019-06-17 08:56:06 -04:00
Nick Mathewson
52d386c9b0
Merge remote-tracking branch 'tor-github/pr/1100'
2019-06-17 08:54:12 -04:00
rl1987
66a15013fa
Allow excluding documentation from the build
2019-06-16 20:21:30 +03:00
Nick Mathewson
7c6cc470f1
Merge branch 'bug30894_035' into ticket30893
2019-06-15 16:50:02 -04:00
Nick Mathewson
4613159c61
Changes file for ticket 30893 (confparse testing)
2019-06-15 16:49:18 -04:00
Nick Mathewson
4ab1d1c0c4
Fix memleak when failing to parse a CSV_INTERVAL.
...
Fixes bug 30894; bugfix on 0.3.4.1-alpha
2019-06-15 16:47:16 -04:00
George Kadianakis
319ce22581
Merge branch 'bug30806'
2019-06-14 13:28:32 +03:00
Nick Mathewson
990b434c4f
Make evloop into a subsystem.
...
Note that the event base object is _not_ created from the initialize
function, since it is configuration-dependent. This will wait until
configuration is integrated into subsystems.
Closes ticket 30806.
2019-06-14 13:28:10 +03:00
teor
6b136c18e1
Merge branch 'bug30455_041' into bug30455_master
2019-06-14 11:49:02 +10:00
teor
e218da1722
make: Improve the documentation for test-network-all
...
"make test-network-all" shows the warnings from each test-network.sh
run on the console, so developers see new warnings early.
Improve the documentation for this feature, and rename a Makefile
variable so the code is self-documenting.
Fixes bug 30455; bugfix on 0.3.0.4-rc.
2019-06-14 11:44:26 +10:00
Nick Mathewson
63325c0596
Add a chutney mode to travis.yml.
2019-06-12 08:55:38 -04:00
George Kadianakis
438b7eec85
Merge branch 'tor-github/pr/1099'
2019-06-12 13:02:49 +03:00
George Kadianakis
96fade0a7d
Merge branch 'tor-github/pr/1088'
2019-06-12 13:01:53 +03:00
David Goulet
f7e8b3b68c
Merge branch 'tor-github/pr/1040'
2019-06-11 11:59:39 -04:00
Taylor Yu
5f5f6bb8fb
Add changes file for 29976
2019-06-11 11:59:30 -04:00
David Goulet
8e112cecd8
Merge branch 'tor-github/pr/1031'
2019-06-11 11:46:38 -04:00
David Goulet
e9d99d2e15
Merge branch 'tor-github/pr/1083'
2019-06-11 11:43:15 -04:00
David Goulet
35dd2d733b
Merge branch 'maint-0.4.1'
2019-06-11 11:30:05 -04:00
David Goulet
ea14fb136c
Merge branch 'tor-github/pr/1050' into maint-0.4.1
2019-06-11 11:29:46 -04:00
Nick Mathewson
5068ccab0b
Add a changes file for ticket 30686.
2019-06-11 11:29:23 -04:00
Nick Mathewson
afa2c39baa
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-06-11 10:17:18 -04:00
Nick Mathewson
3405a311da
Merge branch 'maint-0.4.1'
2019-06-11 10:17:18 -04:00
Nick Mathewson
ce89fe36c8
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-11 10:17:18 -04:00
Nick Mathewson
b0fa1f4fb0
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-06-11 10:17:17 -04:00
Karsten Loesing
0ec4ebd00d
Update geoip and geoip6 to the June 10 2019 database.
2019-06-11 16:12:50 +02:00
Nick Mathewson
eb02c323eb
Merge branch 'maint-0.4.1'
2019-06-11 08:41:55 -04:00
Nick Mathewson
29842f68e7
Merge remote-tracking branch 'tor-github/pr/1082' into maint-0.4.1
2019-06-11 08:41:48 -04:00
George Kadianakis
a7986755ee
Merge branch 'tor-github/pr/1060'
2019-06-11 14:12:22 +03:00
George Kadianakis
e5ad6fb092
Merge branch 'ticket30769_041_01'
2019-06-11 14:11:24 +03:00
David Goulet
c1359b32a4
trunnel: Rename sendme.trunnel to sendme_cell.trunnel
...
This is to avoid having two sendme.{c|h} in the repository since the subsystem
is implemented in src/core/or/sendme.{c|h}.
Fixes #30769
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-11 14:11:10 +03:00
George Kadianakis
646f7a9a94
Merge branch 'ticket30687_042_01'
2019-06-11 14:02:33 +03:00
David Goulet
7cf9d54e6d
token-bucket: Implement a single counter object
...
Closes #30687 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-11 14:02:22 +03:00
George Kadianakis
b83dba7cb0
Merge branch 'maint-0.4.1'
2019-06-11 13:48:16 +03:00
George Kadianakis
eab9dc06af
Merge branch 'tor-github/pr/1065' into maint-0.4.1
2019-06-11 13:48:10 +03:00
teor
bff42c86cd
changes: file for 30799
...
Note that this memory leak is in unreachable code.
2019-06-11 15:15:19 +10:00
teor
dcb8cad4e6
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5
2019-06-11 14:51:46 +10:00
teor
a742a80eea
Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5
2019-06-11 14:51:37 +10:00
teor
202ccc3930
Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5
2019-06-11 14:48:52 +10:00
teor
a58c4cc6dd
Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5
2019-06-11 14:47:40 +10:00
teor
cb20054ccd
Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5
2019-06-11 14:46:24 +10:00
teor
396134188f
Stop hard-coding env vars in the git scripts
...
Set the env vars:
* TOR_MASTER_NAME to override the tor master branch name, and
* TOR_WKT_NAME to override the worktree path
Fixes bug 30841; bugfix on 0.4.0.1-alpha.
2019-06-11 14:34:44 +10:00
teor
973800b847
scripts/git: Stop hard-coding the bash path in the git scripts
...
Some OSes don't have bash in /usr/bin, others have an ancient bash at
this path.
Fixes bug 30840; bugfix on 0.4.0.1-alpha.
2019-06-11 14:29:10 +10:00
Nick Mathewson
cfa943f140
Merge branch 'maint-0.4.1'
2019-06-10 18:44:31 -04:00
Nick Mathewson
5b07ff4011
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-10 18:44:31 -04:00
Nick Mathewson
c8447f95ec
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0
2019-06-10 18:44:20 -04:00
Nick Mathewson
d6b411a351
Merge branch 'maint-0.4.1'
2019-06-10 18:33:26 -04:00
Nick Mathewson
6a72cc2598
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-06-10 18:33:26 -04:00
Nick Mathewson
df8e2bbc0f
Merge remote-tracking branch 'tor-github/pr/1038'
2019-06-10 09:38:40 -04:00
Nick Mathewson
765e4364d9
Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1
2019-06-10 09:37:17 -04:00
teor
430dd2da6e
Merge branch 'bug30713_035' into bug30713_040
2019-06-10 20:50:53 +10:00
teor
be0a4be276
Travis: Skip test_rebind on macOS builds
...
Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable
is set.
Skip test_rebind on macOS in Travis builds, because it is unreliable
on macOS on Travis.
Fixes bug 30713; bugfix on 0.3.5.1-alpha.
2019-06-10 20:49:59 +10:00
teor
d761c3ca6d
Travis: allow the test-stem job to fail
...
Allow the test-stem job to fail in Travis, because it sometimes hangs.
Fixes bug 30744; bugfix on 0.3.5.4-alpha.
2019-06-10 19:18:35 +10:00
Nick Mathewson
c46e99c43c
Tolerate net-unreachable failures in util/socketpair_ersatz
...
This can happen when we have no network stack configured. Fixes bug
30804; bugfix on 0.2.5.1-alpha.
2019-06-07 13:52:03 -04:00
teor
19bf5806ad
dirauth: Return a distinct status when formatting annotations fails
...
Adds ROUTER_AUTHDIR_BUG_ANNOTATIONS to was_router_added_t.
The out-of-order numbering is deliberate: it will be fixed by later commits
for 16564.
Fixes bug 30780; bugfix on 0.2.0.8-alpha.
2019-06-06 17:26:23 +10:00
teor
c7fc53c2e7
Merge branch 'bug30781_040' into bug30781_master
2019-06-06 09:57:31 +10:00
teor
fb3f461406
Merge branch 'bug30781_035' into bug30781_040
2019-06-06 09:56:50 +10:00
teor
c8c2e2b8fc
Merge branch 'bug30781_034' into bug30781_035
...
Moved fix from src/or/routerparse.c to src/feature/dirparse/routerparse.c.
2019-06-06 09:55:44 +10:00
teor
dc8e3cd5ce
Merge branch 'bug30781_029' into bug30781_034
2019-06-06 09:53:02 +10:00
teor
ba83c1e5cf
dirparse: Stop crashing when parsing unknown descriptor purpose annotations
...
We think this bug can only be triggered by modifying a local file.
Fixes bug 30781; bugfix on 0.2.0.8-alpha.
2019-06-06 09:51:24 +10:00
Nick Mathewson
6a6f7eb671
Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0
2019-06-05 16:22:52 -04:00
Nick Mathewson
d63c17f2af
Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0
2019-06-05 16:22:29 -04:00
Nick Mathewson
e51b57ee04
Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0
2019-06-05 16:16:34 -04:00
Nick Mathewson
2300a619a5
Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.4.0
2019-06-05 16:13:53 -04:00
Nick Mathewson
851e881f01
Merge remote-tracking branch 'tor-github/pr/971' into maint-0.4.0
2019-06-05 16:12:07 -04:00
Nick Mathewson
a56d7e37aa
Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.4.0
2019-06-05 16:10:51 -04:00
Mike Perry
a6399da598
Bug 29034: Cleanup hs circuitmap when purpose changes.
...
Leave the other rend and hs_ident data around until circuit free, since code
may still try to inspect it after marking the circuit for close. The
circuitmap is the important thing to clean up, since repurposed
intropoints must be removed from this map to ensure validity.
2019-06-05 12:56:49 -07:00
Mike Perry
c525135dac
Bug 29034: Cleanup hs circuitmap when purpose changes.
...
Leave the other rend and hs_ident data around until circuit free, since code
may still try to inspect it after marking the circuit for close. The
circuitmap is the important thing to clean up, since repurposed
intropoints must be removed from this map to ensure validity.
2019-06-05 11:50:44 -07:00
Nick Mathewson
0982d01369
Start a changelog for 0.4.1.2-alpha
2019-06-05 09:24:18 -04:00
Nick Mathewson
b39a8d315d
Merge remote-tracking branch 'tor-github/pr/1053'
2019-06-05 09:04:09 -04:00
Nick Mathewson
0c16ec4c07
Merge branch 'bug30286_2_squashed'
2019-06-05 08:32:39 -04:00
George Kadianakis
8cb6b2b9ab
Fix typo in #29670 changes file.
2019-06-05 14:56:28 +03:00
George Kadianakis
99bf3d8e14
Merge branch 'tor-github/pr/1072'
2019-06-05 14:40:38 +03:00
David Goulet
a63c5f844b
Merge branch 'tor-github/pr/1067'
2019-06-04 09:57:03 -04:00
Nick Mathewson
4022b6d6b7
Merge branch 'bug29670_035' into bug29670_041
2019-06-04 08:29:05 -04:00
David Goulet
33382184b6
sendme: Do not decrement window in a log_debug()
...
If "Log debug ..." is not set, the decrement never happens. This lead to the
package/deliver window to be out of sync at the stream level and thus breaking
the connection after 50+ cells.
Fixes #30628
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-06-03 14:31:51 -04:00
Nick Mathewson
fd8beab4dd
Merge branch 'bug29875_035' into bug29875_master
2019-05-31 12:40:43 -04:00
Nick Mathewson
c09e7a4e71
changes file for bug 29875.
2019-05-31 12:39:52 -04:00
Nick Mathewson
70b85358af
Fix a logic error in deciding whether to accept SessionGroup=
...
Fixes bug 22619; bugfix on 0.2.7.2-alpha
2019-05-31 08:26:10 -04:00
rl1987
5d4b4f948a
Mention Travis/Appveyor/Jenkins URLs in ReleasingTor.md
2019-05-31 09:35:19 +03:00
Mike Perry
9bef75a29a
Bug 30649: Changes file.
2019-05-30 15:28:21 -07:00
George Kadianakis
dd62cb788e
Merge branch 'tor-github/pr/1059'
2019-05-30 21:01:59 +03:00
David Goulet
8dfc8d7063
Merge branch 'tor-github/pr/1057'
2019-05-30 12:58:35 -04:00
Nick Mathewson
8f3430fc28
changes file for 30629
2019-05-30 12:58:12 -04:00
David Goulet
a462ca7cce
Merge branch 'tor-github/pr/1055'
2019-05-30 12:53:52 -04:00
David Goulet
ef9170db4c
Merge branch 'tor-github/pr/1054'
2019-05-30 09:59:21 -04:00
David Goulet
61bd8f428b
Merge branch 'tor-github/pr/1049'
2019-05-30 09:56:18 -04:00
teor
cdda69ca8a
Travis: only run the stem tests that use a tor binary
...
Closes ticket 30694.
2019-05-30 20:05:03 +10:00
Nick Mathewson
66eae4afff
Check whether gcc-hardening is runnable, and log an error if not
...
Closes ticket 27530.
2019-05-29 16:08:33 -04:00
George Kadianakis
d8bd98b2fd
Merge branch 'tor-github/pr/1032'
2019-05-29 21:28:04 +03:00
George Kadianakis
70553a9134
Merge branch 'tor-github/pr/1037'
2019-05-29 21:25:32 +03:00
George Kadianakis
650bdca97f
Merge branch 'maint-0.4.0'
2019-05-29 21:20:02 +03:00
George Kadianakis
00108b75d4
Merge branch 'tor-github/pr/924' into maint-0.4.0
2019-05-29 21:19:56 +03:00
Nick Mathewson
5cbd71b977
Make get_proxy_type() connection-specific
...
Previously, we were looking at our global settings to see what kind
of proxy we had. But doing this would sometimes give us the wrong
results when we had ClientTransportPlugin configured but we weren't
using it for a particular connection. In several places in the
code, we had added checks to see if we were _really_ using a PT or
whether we were using a socks proxy, but we had forgotten to do so
in at least once case. Instead, since every time we call this
function we are asking about a single connection, it is probably
best just to make this function connection-specific.
Fixes bug 29670; bugfix on 0.2.6.2-alpha.
2019-05-29 11:00:09 -04:00
Nick Mathewson
2d66250d8a
Remove want_cmddata from HSFETCH, which does not in fact want data
...
This looks a copy-and-paste error to me. Fixes bug 30646; bugfix on
0.4.1.1-alpha.
2019-05-29 10:10:57 -04:00
Nick Mathewson
8f0b29961e
Merge branch 'ticket30561_029' into ticket30561_035
2019-05-29 09:43:20 -04:00
David Goulet
3789f22bcb
hs: Implement a helper to repurpose a circuit
...
When we repurpose a hidden service circuit, we need to clean up from the HS
circuit map and any HS related data structured contained in the circuit.
This commit adds an helper function that does it when repurposing a hidden
service circuit.
Fixes #29034
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-05-29 09:40:13 -04:00
Nick Mathewson
0e0cf4abd8
Tweak comments in tor_vasprintf(), and add a changes file for 30651
2019-05-29 09:38:57 -04:00
Nick Mathewson
bdf685e476
Changes file for bug 30614
2019-05-29 09:05:26 -04:00
David Goulet
ff9aa32143
Merge branch 'tor-github/pr/1047'
2019-05-28 14:59:07 -04:00
teor
9eb221b2d2
Travis: make stem log a controller trace, and tail stem's tor log
...
In Travis, make stem log a controller trace to the console.
And tail stem's tor log after failure.
Closes ticket 30591.
2019-05-28 10:20:36 +10:00
George Kadianakis
0a86f14add
Merge branch 'tor-github/pr/1042'
2019-05-27 14:22:01 +03:00
George Kadianakis
130eb227ac
Merge branch 'tor-github/pr/1043'
2019-05-27 14:20:51 +03:00
Nick Mathewson
0bc1241494
Make sure that we send at least some random data in RELAY_DATA cells
...
Proposal 289 prevents SENDME-flooding by requiring the other side to
authenticate the data it has received. But this data won't actually
be random if they are downloading a known resource. "No problem",
we said, "let's fell the empty parts of our cells with some
randomness!" and we did that in #26871 .
Unfortunately, if the relay data payloads are all completely full,
there won't be any empty parts for us to randomize.
Therefore, we now pick random "randomness windows" between
CIRCWINDOW_INCREMENT/2 and CIRCWINDOW_INCREMENT. We remember whether we have
sent a cell containing at least 16 bytes of randomness in that window. If we
haven't, then when the window is exhausted, we send one. (This window approach
is designed to lower the number of rng checks we have to do. The number 16 is
pulled out of a hat to change the attacker's guessing difficulty to
"impossible".)
Implements 28646.
2019-05-27 14:20:07 +03:00
Nick Mathewson
6d9e47702f
changes file for test coverage
2019-05-24 07:42:59 -04:00
David Goulet
29955f13e5
Merge branch 'tor-github/pr/1022'
2019-05-23 09:50:28 -04:00
David Goulet
e13e2012b9
Merge branch 'tor-github/pr/1034'
2019-05-23 09:40:07 -04:00
David Goulet
327bb0e2ca
Merge branch 'tor-github/pr/988'
2019-05-23 09:30:36 -04:00
Nick Mathewson
57ee0e3af9
Only reject POSTDESCRIPTOR purpose= when the purpose is unrecognized
...
Fixes bug 30580; bugfix on 0.4.1.1-alpha.
2019-05-23 08:24:29 -04:00
Nick Mathewson
fa57b6cfb0
Fold last entry into changelog
2019-05-22 12:00:20 -04:00
Nick Mathewson
24c2502070
Merge remote-tracking branch 'dgoulet/ticket30454_035_01'
2019-05-22 11:50:46 -04:00
David Goulet
245dccb77d
Merge remote-tracking branch 'nickm/ticket30454_034_01_squashed' into ticket30454_035_01
2019-05-22 11:43:55 -04:00
rl1987
fb91e1c6ef
Remove torctl.in from contrib/dist
2019-05-21 14:56:53 +03:00
Nick Mathewson
e2d3d44496
Add a new "autostyle" make target to run all of our reformatting
...
Closes ticket 30539.
2019-05-20 12:08:30 -04:00
David Goulet
9f52b87518
hs: Add changes file for #30454
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-05-20 08:56:34 -04:00
Nick Mathewson
aa4f2f7397
Initial changelog draft for 0.4.1.1-alpha (mostly automated)
2019-05-17 10:12:07 -04:00
Nick Mathewson
37aae23945
OOM-purge the DNS cache one part at a time
...
Previously we purged it in 1-hour increments -- but one-hour is the
maximum TTL for the cache! Now we do it in 25%-TTL increments.
Fixes bug 29617; bugfix on 0.3.5.1-alpha.
2019-05-17 10:03:41 -04:00
Nick Mathewson
b2b779228d
Merge remote-tracking branch 'tor-github/pr/1033'
2019-05-17 08:18:20 -04:00
Nick Mathewson
9cec7a7b5c
Merge branch 'maint-0.4.0'
2019-05-17 08:10:17 -04:00
Nick Mathewson
e5deb2bbc7
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-05-17 08:10:16 -04:00
Nick Mathewson
c7f9f7e542
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-05-17 08:10:16 -04:00
Nick Mathewson
a521c42788
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-05-17 08:10:15 -04:00
Karsten Loesing
4e262196a8
Update geoip and geoip6 to the May 13 2019 database.
2019-05-17 08:52:13 +02:00
Mike Perry
1a79bedd97
Changes file.
2019-05-16 20:25:25 +00:00
Nick Mathewson
6246f4539e
changes file for coverity fixes in tests (30150)
2019-05-16 15:38:08 -04:00
Iain R. Learmonth
58cb98af32
Prop 301: No longer vote on RecommendedPackages
...
This is the first half of implementing proposal 301. The
RecommendedPackages torrc option is marked as obsolete and
the test cases for the option removed. Additionally, the code relating
to generating and formatting package lines in votes is removed.
These lines may still appear in votes from other directory authorities
running earlier versions of the code and so consensuses may still
contain package lines. A new consensus method will be needed to stop
including package lines in consensuses.
Fixes : #28465
2019-05-16 13:31:54 +01:00
George Kadianakis
338cfb3179
Merge branch 'tor-github/pr/1002'
2019-05-15 23:23:18 +03:00
David Goulet
39a14421b1
Merge branch 'tor-github/pr/1021'
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-05-15 15:35:22 -04:00
George Kadianakis
d71fa707dd
Merge branch 'bug28780-squashed3-rebased' into bug28780_rebase
2019-05-15 16:46:51 +03:00
Mike Perry
5cc988a947
Bug 28780: Changes file
2019-05-15 16:44:59 +03:00
George Kadianakis
a7779df84c
Merge branch 'bug29085_rebase'
2019-05-15 15:13:08 +03:00
Mike Perry
5ef0d89d91
Bug 29085: Changes file.
2019-05-15 15:10:48 +03:00
Nick Mathewson
9e5c27bd2c
changes file for ticket 28878
2019-05-15 07:50:56 -04:00
George Kadianakis
1de11dc47a
Merge branch 'maint-0.4.0'
2019-05-15 13:46:20 +03:00
George Kadianakis
cd264e145b
Merge branch 'tor-github/pr/1013' into maint-0.4.0
2019-05-15 13:45:39 +03:00
Nick Mathewson
1c95bdb83b
Merge branch 'ticket30452_035_v3' into ticket30452_041_v3
2019-05-14 19:20:53 -04:00
Nick Mathewson
1b16fcb70c
Add a --list-modules command
...
Closes ticket 30452.
2019-05-14 19:19:53 -04:00
Nick Mathewson
43d4119454
Merge remote-tracking branch 'tor-github/pr/1004'
2019-05-14 11:43:10 -04:00
Nick Mathewson
9ad2eb8f73
Merge branch 'bug28683_30173_29203_squashed'
2019-05-13 14:33:31 -04:00
Mike Perry
0d275ec592
Changes file for bugs28693+30173+29203.
2019-05-13 14:30:35 -04:00
Nick Mathewson
c6523a6398
Merge remote-tracking branch 'tor-github/pr/998'
2019-05-13 14:25:54 -04:00
David Goulet
2f44786e30
Merge branch 'tor-github/pr/976'
2019-05-13 07:34:00 -04:00
rl1987
0a4e68e4e2
Add changes file
2019-05-11 19:03:46 +03:00
Nick Mathewson
ff55840343
Don't pass a NULL into a %s when logging client auth file load failure
...
Fortunately, in 0.3.5.1-alpha we improved logging for various
failure cases involved with onion service client auth.
Unfortunately, for this one, we freed the file right before logging
its name.
Fortunately, tor_free() sets its pointer to NULL, so we didn't have
a use-after-free bug.
Unfortunately, passing NULL to %s is not defined.
Fortunately, GCC 9.1.1 caught the issue!
Unfortunately, nobody has actually tried building Tor with GCC 9.1.1
before. Or if they had, they didn't report the warning.
Fixes bug 30475; bugfix on 0.3.5.1-alpha.
2019-05-10 17:47:43 -04:00
George Kadianakis
501d1ae0bd
Merge branch 'tor-github/pr/973'
2019-05-10 12:49:01 +03:00
David Goulet
3885e7b44b
Merge branch 'tor-github/pr/1000'
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-05-08 08:02:28 -04:00
Neel Chauhan
3cafdeb8c0
Only call tor_addr_parse() in circuit_is_acceptable() when needed
2019-05-07 11:52:56 -04:00
David Goulet
b72f5da03d
Merge branch 'tor-github/pr/994'
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-05-07 08:02:39 -04:00
Nick Mathewson
c8c64caf37
Merge remote-tracking branch 'tor-github/pr/923'
2019-05-06 17:16:37 -04:00
Nick Mathewson
3c2648bbda
Move "relay" and "router" periodic callbacks out of mainloop.c
...
(Some of these callbacks are specific to the OR module, so now it's
time to have an or_sys and or_periodic.)
2019-05-06 16:35:39 -04:00
George Kadianakis
e9769d6217
Hiding crypt_path_t: Add changes file.
2019-05-06 17:54:51 +03:00
David Goulet
b3492d53c3
Merge branch 'tor-github/pr/984'
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-05-03 10:56:12 -04:00
George Kadianakis
b2c2cb9287
Merge branch 'tor-github/pr/986'
2019-05-02 18:12:52 +03:00
David Goulet
562bcbcfc2
sendme: Add changes file for prop289
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-05-02 11:10:41 -04:00
George Kadianakis
4d461e20f7
Merge branch 'tor-github/pr/999'
2019-05-02 17:48:09 +03:00
Nick Mathewson
ee36bfa6de
Changes file for improved dirauth modularity (ticket 30345)
2019-05-02 09:22:13 -04:00
Nick Mathewson
3d13841fa5
Remove changes files that are already in 0.4.0.5 or earlier
2019-05-02 08:42:01 -04:00
Nick Mathewson
0a2b96cae6
Merge remote-tracking branch 'tor-github/pr/989'
2019-05-02 08:36:09 -04:00
Mike Perry
332617a81a
Changes file for bug29231.
2019-05-01 21:03:23 +00:00
Nick Mathewson
4973ceb46b
Merge remote-tracking branch 'tor-github/pr/950'
2019-05-01 09:11:20 -04:00
Nick Mathewson
309467c64e
Rename tor_mem_is_zero to fast_mem_is_zero()
...
For memeq and friends, "tor_" indicates constant-time and "fast_"
indicates optimized. I'm fine with leaving the constant-time
"safe_mem_is_zero" with its current name, but the "tor_" prefix on
the current optimized version is misleading.
Also, make the tor_digest*_is_zero() uniformly constant-time, and
add a fast_digest*_is_zero() version to use as needed.
A later commit in this branch will fix all the users of
tor_mem_is_zero().
Closes ticket 30309.
2019-04-30 14:45:51 -04:00
Taylor Yu
0900367996
Changes file for ticket30007
2019-04-30 13:18:46 -05:00
George Kadianakis
847fc3280d
Merge branch 'maint-0.4.0'
2019-04-30 19:26:30 +03:00
George Kadianakis
e1d4e2badb
Merge branch 'tor-github/pr/978' into maint-0.4.0
2019-04-30 19:26:14 +03:00
George Kadianakis
f2800b53ad
Merge branch 'tor-github/pr/985'
2019-04-30 19:25:32 +03:00
George Kadianakis
d885ed867f
Merge branch 'tor-github/pr/937'
2019-04-30 19:21:46 +03:00
George Kadianakis
9084a90b00
Merge branch 'tor-github/pr/936'
2019-04-30 19:21:15 +03:00
George Kadianakis
a44aca5453
Merge branch 'tor-github/pr/993'
2019-04-30 19:13:57 +03:00
George Kadianakis
86f8dfe419
Merge branch 'tor-github/pr/983'
2019-04-30 19:13:30 +03:00
David Goulet
43c119fedb
Merge branch 'tor-github/pr/980'
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-04-30 11:50:36 -04:00
David Goulet
e543c4e20c
Merge branch 'tor-github/pr/909'
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-04-30 11:17:45 -04:00
Nick Mathewson
7e03500eef
Changes file for periodic event movement
2019-04-30 11:14:59 -04:00
Nick Mathewson
48e1ab1720
Changes file for 29732.
2019-04-30 11:11:39 -04:00
rl1987
b05b165a75
Add changes file
2019-04-30 09:16:36 +03:00
rl1987
6b2d8b1a7c
Add changes file
2019-04-30 09:15:35 +03:00
rl1987
1218546296
Add changes file
2019-04-30 09:11:17 +03:00
Nick Mathewson
821dd54586
Merge branch 'bug30316_035' into bug30316_040
...
Fixes conflicts and also moves bandwidth-file-digest.
2019-04-29 14:34:03 -04:00
Nick Mathewson
0ab4dc7ef7
Move bandwidth-file-headers line to appear in the correct vote section
...
Fixes bug 30316; bugfix on 0.3.5.1-alpha.
2019-04-29 14:31:09 -04:00
Nick Mathewson
44e6663b8a
Merge remote-tracking branch 'tor-github/pr/972'
2019-04-29 13:36:35 -04:00
Nick Mathewson
206d28ff15
Merge branch 'maint-0.4.0'
2019-04-29 10:15:11 -04:00
Nick Mathewson
593d29920e
Merge remote-tracking branch 'tor-github/pr/974' into maint-0.4.0
2019-04-29 10:15:03 -04:00
rl1987
6d347fe329
Remove obsolete OpenSUSE initscript
2019-04-27 10:33:33 +03:00
Nick Mathewson
806539b40a
Use fast check for missing id in node_is_a_configured_bridge()
...
Fixes bug 30308; bugfix on 0.3.5.1-alpha.
2019-04-26 11:19:46 -04:00
Nick Mathewson
650b94ebc1
Use a linear algorithm to subtract two nodelists.
...
The nodelist_idx for each node_t serves as a unique identifier for
the node, so we can use a bitarray to hold all the excluded
nodes, and then remove them from the smartlist.
Previously use used smartlist_subtract(sl, excluded), which is
O(len(sl)*len(excluded)).
We can use this function in other places too, but this is the one
that showed up on the profiles of 30291.
Closes ticket 30307.
2019-04-26 11:04:44 -04:00
Nick Mathewson
efeb101b96
Merge remote-tracking branch 'tor-github/pr/889'
2019-04-25 20:25:34 -04:00
Nick Mathewson
3ed7ceeb85
changes file for ticket 30091 (controller parsing refactor)
2019-04-25 14:13:03 -04:00
Nick Mathewson
dbfe1a14e4
When parsing a multiline controller command, be careful with linebreaks
...
The first line break in particular was mishandled: it was discarded
if no arguments came before it, which made it impossible to
distinguish arguments from the first line of the body.
To solve this, we need to allocate a copy of the command rather than
using NUL to separate it, since we might have "COMMAND\n" as our input.
Fixes ticket 29984.
2019-04-25 14:13:03 -04:00
George Kadianakis
974c2674eb
Merge branch 'maint-0.4.0'
2019-04-25 15:47:07 +03:00
George Kadianakis
a39789a02c
Merge branch 'tor-github/pr/960' into maint-0.4.0
2019-04-25 15:46:45 +03:00
George Kadianakis
811a93f803
Merge branch 'tor-github/pr/953'
2019-04-25 15:43:47 +03:00
Alexander Færøy
0429072495
Lower log level of unlink() errors in networkstatus_set_current_consensus().
...
In this patch we lower the log level of the failures for the three calls
to unlink() in networkstatus_set_current_consensus(). These errors might
trigger on Windows because the memory mapped consensus file keeps the
file in open state even after we have close()'d it. Windows will then
error on the unlink() call with a "Permission denied" error.
The consequences of ignoring these errors is that we leave an unused
file around on the file-system, which is an easier way to fix this
problem right now than refactoring networkstatus_set_current_consensus().
See: https://bugs.torproject.org/29930
2019-04-25 01:59:37 +02:00
Nick Mathewson
6320b2988c
Merge remote-tracking branch 'tor-github/pr/942'
2019-04-24 17:06:56 -04:00
Nick Mathewson
0cbe0f9cab
Merge remote-tracking branch 'tor-github/pr/964'
2019-04-24 17:05:20 -04:00
David Goulet
f39dd0a700
Merge branch 'tor-github/pr/951'
2019-04-24 09:53:15 -04:00
David Goulet
5bcf87c224
Merge branch 'tor-github/pr/955'
2019-04-24 09:45:32 -04:00
David Goulet
4b599aaae4
Merge branch 'tor-github/pr/939'
2019-04-24 09:43:28 -04:00
teor
f35bd36814
test-network-all: Test IPv6-only v3 single onion services
...
In "make test-network-all", test IPv6-only v3 single onion services,
using the chutney network single-onion-v23-ipv6-md. This test will
not pass until 23588 has been merged.
Closes ticket 27251.
2019-04-24 17:42:59 +10:00
teor
b19dd1bb11
Update 23588 changes file to say what the patch actually does
...
Stop ignoring IPv6 link specifiers sent to v3 onion services.
v3 onion service IPv6 support is still incomplete, see 23493 for
details.
Fixes bug 23588; bugfix on 0.3.2.1-alpha.
Patch by Neel Chauhan.
2019-04-24 17:28:44 +10:00
Neel Chauhan
2618347657
Use fascist_firewall_choose_address_ls() in hs_get_extend_info_from_lspecs()
2019-04-24 17:28:34 +10:00
Nick Mathewson
15d4238383
Merge remote-tracking branch 'tor-github/pr/944'
2019-04-23 15:39:23 -04:00
Nick Mathewson
475ac11bc1
Merge remote-tracking branch 'tor-github/pr/935'
2019-04-23 14:11:04 -04:00
Nick Mathewson
6559aefc7b
Merge remote-tracking branch 'tor-github/pr/971'
2019-04-23 12:52:54 -04:00
Nick Mathewson
b0459de217
Merge branch 'ticket30051_take2_squashed'
2019-04-23 12:51:44 -04:00
rl1987
0c78811cea
Add changes file
2019-04-23 12:51:29 -04:00
Nick Mathewson
a7599c5be2
Merge remote-tracking branch 'tor-github/pr/962'
2019-04-23 12:48:37 -04:00
teor
1788343aff
Stop looking for scripts in the build directory during "make shellcheck"
...
Fixes bug 30263; bugfix on 0.4.0.1-alpha.
2019-04-23 12:31:14 +10:00
teor
ac5753d3ca
Coding Standards: Document how to find git commits
...
Document how to find git commits and tags for bug fixes in
CodingStandards.md.
And update some changes file documentation.
Closes ticket 30261.
2019-04-23 10:03:18 +10:00
teor
9a97b5ff56
Travis: Show stem's tor log after failure
...
Closes ticket 30234.
2019-04-22 11:48:07 +10:00
teor
231036a110
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-19 12:00:41 +10:00
teor
742b5b32d5
Merge remote-tracking branch 'tor-github/pr/710' into maint-0.3.5
2019-04-19 11:52:48 +10:00
teor
cb084de5e5
Merge remote-tracking branch 'tor-github/pr/726' into maint-0.3.5
2019-04-19 11:51:05 +10:00
teor
2ae67fee42
Merge remote-tracking branch 'tor-github/pr/745' into maint-0.3.5
2019-04-19 11:48:41 +10:00
teor
4a66c2d636
Merge remote-tracking branch 'tor-github/pr/947' into maint-0.3.5
2019-04-19 11:47:50 +10:00
teor
116970dda7
Merge remote-tracking branch 'tor-github/pr/946' into maint-0.3.4
2019-04-19 11:47:10 +10:00
teor
b1762f8d12
Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4
2019-04-19 11:44:38 +10:00
teor
8154b33f9c
Merge remote-tracking branch 'tor-github/pr/791' into maint-0.3.4
2019-04-19 11:43:46 +10:00
teor
2460b4461f
Merge remote-tracking branch 'tor-github/pr/792' into maint-0.2.9
2019-04-19 11:42:09 +10:00
teor
ec213ae8a0
Merge remote-tracking branch 'tor-github/pr/772' into maint-0.2.9
2019-04-19 11:38:52 +10:00
George Kadianakis
78223ab0fc
Merge branch 'tor-github/pr/938'
2019-04-18 13:23:32 +03:00
George Kadianakis
2db9bb02c7
Merge branch 'tor-github/pr/925'
2019-04-18 13:22:54 +03:00
George Kadianakis
d867b7ae1d
Merge branch 'maint-0.4.0'
2019-04-18 13:22:23 +03:00
George Kadianakis
6a179b1072
Merge branch 'tor-github/pr/891' into maint-0.4.0
2019-04-18 13:21:59 +03:00
rl1987
0d88b808e9
Remove contrib/dist/tor.sh.in
2019-04-17 13:15:02 +03:00
teor
728d20ed08
connection_edge: Return a web page when HTTPTunnelPort is misconfigured
...
Return an informative web page when the HTTPTunnelPort is used as an
HTTP proxy.
Closes ticket 27821, patch by "eighthave".
2019-04-17 17:58:40 +10:00
teor
c72f0cd5c7
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-17 16:46:40 +10:00
teor
37d7daa3cd
changes: update the changes file for 30001
2019-04-17 12:34:33 +10:00
Bernhard M. Wiedemann
8c4e68438d
Do not warn about compatible OpenSSL upgrades
...
When releasing OpenSSL patch-level maintenance updates,
we do not want to rebuild binaries using it.
And since they guarantee ABI stability, we do not have to.
Without this patch, warning messages were produced
that confused users:
https://bugzilla.opensuse.org/show_bug.cgi?id=1129411
Fixes bug 30190; bugfix on 0.2.4.2-alpha commit 7607ad2bec
Signed-off-by: Bernhard M. Wiedemann <bwiedemann@suse.de>
2019-04-17 01:55:04 +02:00
Nick Mathewson
82b690d7da
Merge remote-tracking branch 'tor-github/pr/910'
2019-04-16 08:09:20 -04:00
Tobias Stoeckmann
670d0f9f5b
Clear memory in smartlist_remove_keeporder.
...
The smartlist functions take great care to reset unused pointers inside
the smartlist memory to NULL.
The function smartlist_remove_keeporder does not clear memory in such
way when elements have been removed. Therefore call memset after the
for-loop that removes elements. If no element is removed, it is
effectively a no-op.
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
2019-04-15 14:51:36 -04:00
Nick Mathewson
358df18064
Merge branch 'bug30189_035' into bug30189_041
2019-04-15 14:27:32 -04:00
Nick Mathewson
802ac8ad61
Use a tor_abort_() wrapper in our util_bug.h macros
...
Previously, our use of abort() would break anywhere that we didn't
include stdlib.h. This was especially troublesome in case where
tor_assert_nonfatal() was used with ALL_BUGS_ARE_FATAL, since that
one seldom gets tested.
As an alternative, we could have just made this header include
stdlib.h. But that seems bloaty.
Fixes bug 30189; bugfix on 0.3.4.1-alpha.
2019-04-15 14:16:23 -04:00
George Kadianakis
9ae267538c
Merge branch 'tor-github/pr/941'
2019-04-15 13:57:40 +03:00
George Kadianakis
3f9efc5e88
Merge branch 'maint-0.4.0'
2019-04-15 13:56:48 +03:00
George Kadianakis
15591e1bbd
Merge branch 'tor-github/pr/948' into maint-0.4.0
2019-04-15 13:56:37 +03:00
rl1987
55b4f02ba6
Fix shellcheck warnings in fixup_filenames.sh
2019-04-15 12:13:35 +03:00
teor
1177818c32
Merge branch 'rust-panic1-035' into rust-panic1-040
2019-04-15 10:18:59 +10:00
teor
a6d0420f7c
Merge branch 'rust-panic1-034' into rust-panic1-035
...
Trivial merge: a blank line was removed between 0.3.4 and 0.3.5.
2019-04-15 10:18:01 +10:00
teor
5ab5c8ec15
Merge branch 'rust-panic1' into rust-panic1-034
2019-04-15 10:15:02 +10:00
Neel Chauhan
e728811110
Add changes file for Bug #29613
2019-04-14 12:48:07 -04:00
rl1987
db52180abe
Add changes file
2019-04-12 22:43:49 +03:00
teor
8ff6ab0a39
changes: file for 30117
2019-04-12 08:38:30 -04:00
George Kadianakis
7b386f2356
Merge branch 'tor-github/pr/908'
2019-04-12 13:47:08 +03:00
George Kadianakis
86aa141572
Merge branch 'tor-github/pr/754'
2019-04-12 13:45:53 +03:00
Neel Chauhan
c07d854772
Remove callback for setting bridges as running
2019-04-11 21:28:35 -04:00
Neel Chauhan
e16f5184da
Fix grammar in bug24490 changes file
2019-04-11 20:32:38 -04:00
Nick Mathewson
cdafcc49bc
Fix a memory leak in tor-resolve.c
...
Closes bug 30151/coverity CID 1441830. Bugfix on 0.4.0.1-alpha when
we started doing trunnel parsing in tor-resolve.c.
2019-04-11 19:10:05 -04:00
Nick Mathewson
7332346002
Changes file and practracker updates for 30149.
2019-04-11 18:58:44 -04:00
Nick Mathewson
85ff6f9114
Fix a memory leak on failure to create keys directory.
...
Fixes bug 30148, which is also CID 1437429 and CID 1437454. Bugfix
on 0.3.3.1-alpha, when separate key directories became a thing.
2019-04-11 18:18:14 -04:00
Nick Mathewson
e39b53ef7d
changes file and practracker updates for 30147.
2019-04-11 17:59:21 -04:00
Neel Chauhan
011307dd5f
Make repeated/rate limited HSFETCH queries fail with QUERY_RATE_LIMITED
2019-04-11 15:21:17 -04:00
Nick Mathewson
9fabf104ed
Merge remote-tracking branch 'tor-github/pr/913'
2019-04-11 14:30:05 -04:00
Nick Mathewson
d549440124
Merge remote-tracking branch 'tor-github/pr/887'
2019-04-11 14:29:16 -04:00
Nick Mathewson
3be1e26b8d
Merge branch 'maint-0.4.0'
2019-04-10 11:31:44 -04:00
Nick Mathewson
412bcc5b2a
Merge remote-tracking branch 'tor-github/pr/926' into maint-0.4.0
2019-04-10 11:31:33 -04:00
George Kadianakis
2cdc6b2005
Add changes file for #30040 .
2019-04-10 12:46:27 +03:00
teor
5722c6d12d
scripts: In git-pull-all.sh, also fetch the latest tor-github pull requests
...
Implements ticket 30114.
2019-04-10 19:26:47 +10:00
teor
12b9bfc05f
test: Also avoid reading the system default torrc in integration tests
...
Part of 29702.
2019-04-10 19:03:43 +10:00
rl1987
acec0192c3
Add changes file
2019-04-10 18:45:36 +10:00
teor
a1d9f44971
Merge branch 'maint-0.4.0'
2019-04-10 18:27:11 +10:00
teor
454bdb22ee
Merge remote-tracking branch 'tor-github/pr/920' into maint-0.4.0
2019-04-10 18:26:49 +10:00
teor
8cfab3b7c3
doc: Improve the documentation for MapAddress .exit
...
Fixes bug 30109; bugfix on 0.1.0.1-rc.
2019-04-10 17:43:59 +10:00
Nick Mathewson
c24928dd8f
Changes file for bug30041
2019-04-09 12:05:33 -04:00
Nick Mathewson
c10011532e
Changes file for bug30041
2019-04-09 12:03:22 -04:00
George Kadianakis
16041d7918
Merge branch 'maint-0.4.0'
2019-04-09 12:25:18 +03:00
George Kadianakis
c7cf49dc3c
Merge branch 'tor-github/pr/915' into maint-0.4.0
2019-04-09 12:24:52 +03:00
teor
3d45079c27
Merge branch 'maint-0.4.0'
2019-04-09 11:36:59 +10:00
teor
2dab7a1078
Merge remote-tracking branch 'tor-github/pr/862'
2019-04-09 11:36:12 +10:00
teor
92e8bdf296
Merge remote-tracking branch 'tor-github/pr/892' into maint-0.4.0
2019-04-09 11:35:41 +10:00
rl1987
61e6b217c5
manpage: Clarify that Tor does stream isolation between *Port listeners by default
...
cherry-pick of tor-github/pr/841 to maint-0.4.0.
2019-04-09 11:34:51 +10:00
Nick Mathewson
a63bd87760
Detect and suppress an additional gmtime() warning in test_util.c
...
Fixes bug 29922; bugfix on 0.2.9.3-alpha when we tried to capture
all these warnings. No need to backport any farther than 0.3.5,
though -- these warnings don't cause test failures before then.
This one was tricky to find because apparently it only happened on
_some_ windows builds.
2019-04-08 17:02:14 -04:00
rl1987
0e0a0b9802
Fix SC2006 in minimize.sh
2019-04-08 11:16:45 +03:00
teor
4cffc7fe9c
Merge branch 'maint-0.4.0'
2019-04-06 12:23:25 +10:00
teor
b100c9e980
Merge remote-tracking branch 'tor-github/pr/911' into maint-0.4.0
2019-04-06 12:15:41 +10:00
teor
4dd96f7444
changes: Ticket 29241 is actually a bug on NSS in 0.3.5.1-alpha
2019-04-06 11:07:20 +10:00
Nick Mathewson
5cb94cbf9d
NSS: disable TLS1.2 SHA-384 ciphersuites.
...
In current NSS versions, these ciphersuites don't work with
SSL_ExportKeyingMaterial(), which was causing relays to fail when
they tried to negotiate the v3 link protocol authentication.
Fixes bug 29241; bugfix on 0.4.0.1-alpha.
2019-04-06 11:06:34 +10:00
Nick Mathewson
680fd3f8fb
NSS: Log an error message when SSL_ExportKeyingMaterial() fails
...
Diagnostic for 29241.
2019-04-06 11:06:22 +10:00
teor
48e990359b
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-06 09:33:11 +10:00
teor
316aed502e
Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5
2019-04-06 09:32:53 +10:00
teor
ea5e371822
Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5
2019-04-06 09:31:52 +10:00
teor
44ea341117
Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5
2019-04-06 09:30:52 +10:00
teor
102178e6d4
Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4
2019-04-06 09:30:04 +10:00
teor
a0db5ade3e
Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9
2019-04-06 09:28:58 +10:00
teor
e1955a2c54
Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9
2019-04-06 09:28:13 +10:00
rl1987
e8e6931638
Add changes file
2019-04-05 19:03:41 +03:00
George Kadianakis
df4e2c42a8
Merge branch 'tor-github/pr/907'
2019-04-05 16:45:55 +03:00
George Kadianakis
071a000d67
Merge branch 'tor-github/pr/906' into maint-0.4.0
2019-04-05 16:44:59 +03:00
George Kadianakis
5584b6392d
Merge branch 'maint-0.4.0'
2019-04-05 14:57:06 +03:00
George Kadianakis
2cc3c98bc4
Merge branch 'tor-github/pr/901' into maint-0.4.0
2019-04-05 14:56:52 +03:00
George Kadianakis
76f1763976
Merge branch 'maint-0.4.0'
2019-04-05 14:55:22 +03:00
George Kadianakis
7fe169a500
Merge branch 'tor-github/pr/879' into maint-0.4.0
2019-04-05 14:55:09 +03:00
George Kadianakis
3393c8d510
Merge branch 'maint-0.4.0'
2019-04-05 14:53:39 +03:00
George Kadianakis
217db9efe1
Merge branch 'tor-github/pr/902' into maint-0.4.0
2019-04-05 14:53:33 +03:00
George Kadianakis
574c207670
Merge branch 'maint-0.4.0'
2019-04-05 14:51:33 +03:00
George Kadianakis
747b74c182
Merge branch 'tor-github/pr/800' into maint-0.4.0
2019-04-05 14:51:21 +03:00
teor
ac269d5c30
changes: file for 29660
2019-04-05 15:17:19 +10:00
teor
e992c5e4bc
Merge branch 'bug29500_040_monoinit_revert' into bug29500_master_monoinit
...
Apply data structure changes between 0.4.0 and 0.4.1.
2019-04-05 12:24:20 +10:00
Mike Perry
28db7646ba
Changes file for bug 29500.
2019-04-05 12:14:18 +10:00
Nick Mathewson
1779878f9e
Merge remote-tracking branch 'tor-github/pr/752'
2019-04-04 20:39:36 -04:00
Nick Mathewson
0e7b34354a
Merge branch 'maint-0.4.0'
2019-04-04 20:27:04 -04:00
Nick Mathewson
d016bbaa7d
Merge branch 'bug29959_040_squashed' into maint-0.4.0
2019-04-04 20:26:47 -04:00
teor
8e961b2174
bwauth: Actually include the bandwidth-file-digest in authority votes
...
Fixes bug 29959; bugfix on 0.4.0.2-alpha.
2019-04-04 20:26:09 -04:00
Nick Mathewson
d194f6bedf
Implement an DormantCanceledByStartup option
...
Closes ticket 29357, and comes with appropriate notions of caution.
2019-04-04 11:48:36 -04:00
Nick Mathewson
db1c1dba34
Merge branch 'bug30021_029' into bug30021_035
2019-04-04 11:26:33 -04:00
Nick Mathewson
1710f4bbd6
Do not cache bogus results from classifying client ciphers
...
When classifying a client's selection of TLS ciphers, if the client
ciphers are not yet available, do not cache the result. Previously,
we had cached the unavailability of the cipher list and never looked
again, which in turn led us to assume that the client only supported
the ancient V1 link protocol. This, in turn, was causing Stem
integration tests to stall in some cases. Fixes bug 30021; bugfix
on 0.2.4.8-alpha.
2019-04-04 11:24:55 -04:00
teor
ef06ef217a
Merge branch 'bug30011_035' into bug30011_040
...
Merge bug30011 new package timelimit with 0.4.0 new package shellcheck.
Move shellcheck into the correct category.
2019-04-04 13:23:26 +10:00
teor
3fa42d599a
Travis: Terminate test-stem if it takes more than 9.5 minutes to run
...
(Travis terminates the job after 10 minutes of no output.)
Diagnostic for 29437.
Fixes bug 30011; bugfix on 0.3.5.4-alpha.
2019-04-04 13:21:35 +10:00
Neel Chauhan
d4d77b277e
Stop setting bridges running in networkstatus_getinfo_by_purpose()
2019-04-03 15:27:33 -04:00
Nick Mathewson
5613968d57
Improve logging for 28614.
...
When we fixed 28614, our answer was "if we failed to load the
consensus on windows and it had a CRLF, retry it." But we logged
the failure at "warn", and we only logged the retry at "info".
Now we log the retry at "notice", with more useful information.
Fixes bug 30004.
2019-04-03 14:30:56 -04:00
Nick Mathewson
99b87d7ca4
Even more diagnostic messages for bug 28223.
...
Try to figure out _where exactly_ we are first encountering NULs in
microdescriptors, and what we are doing when that happens.
2019-04-03 13:53:06 -04:00
rl1987
b2eced6c07
Add changes file
2019-04-03 18:05:23 +03:00
George Kadianakis
0b6769a99e
Merge branch 'maint-0.4.0'
2019-04-03 17:59:46 +03:00
George Kadianakis
42aae0e693
Merge branch 'tor-github/pr/867' into maint-0.4.0
2019-04-03 17:59:02 +03:00
George Kadianakis
50341bb5ba
Merge branch 'maint-0.4.0'
2019-04-03 17:55:41 +03:00
George Kadianakis
828f1829c8
Merge branch 'tor-github/pr/811' into maint-0.4.0
2019-04-03 17:50:49 +03:00
Nick Mathewson
367dd9cf02
30001: Fix a race condition in test_dir_handle_get.c
...
Previously we used time(NULL) to set the Expires: header in our HTTP
responses. This made the actual contents of that header untestable,
since the unit tests have no good way to override time(), or to see
what time() was at the exact moment of the call to time() in
dircache.c.
This gave us a race in dir_handle_get/status_vote_next_bandwidth,
where the time() call in dircache.c got one value, and the call in
the tests got another value.
I'm applying our regular solution here: using approx_time() so that
the value stays the same between the code and the test. Since
approx_time() is updated on every event callback, we shouldn't be
losing any accuracy here.
Fixes bug 30001. Bug introduced in fb4a40c32c4a7e5; not in any
released Tor.
2019-04-03 10:16:18 -04:00
Nick Mathewson
4efbb5d2c1
Merge branch 'maint-0.4.0'
2019-04-03 09:27:44 -04:00
Nick Mathewson
de76862fd6
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-03 09:27:44 -04:00
Nick Mathewson
4aa02d3c7a
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-03 09:27:43 -04:00
Nick Mathewson
3cfcfbac46
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-03 09:27:42 -04:00
Nick Mathewson
ee6f54ff3f
Merge remote-tracking branch 'tor-github/pr/860'
2019-04-03 08:33:40 -04:00
Karsten Loesing
54e249e269
Update geoip and geoip6 to the April 2 2019 database.
2019-04-03 09:26:28 +02:00
teor
583ed7c6ec
Merge remote-tracking branch 'tor-github/pr/864'
2019-04-02 11:46:42 +10:00
teor
9014add25f
Merge branch 'maint-0.4.0'
2019-04-02 11:45:39 +10:00
teor
9242f32883
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-02 11:45:31 +10:00
teor
0418d4081a
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-02 11:45:22 +10:00
teor
74775b2dfd
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-02 11:45:13 +10:00
teor
7014e57f4a
Merge branch 'bug29036-29962-034' into bug29036-29962-035
...
Merge the moved coverage line from 29036 with the stem changes in
maint-0.3.5.
2019-04-01 14:11:20 +10:00
rl1987
124990aa01
Add changes file
2019-04-01 14:08:24 +10:00
teor
ac28e56ccb
Merge branch 'bug29036-029' into bug29036-29962-034
2019-04-01 14:07:58 +10:00
teor
eb0bd18d6e
changes: Use the first Tor version with CI coverage for the 29036 changes file
...
Otherwise, "make check-changes" will complain when we backport the change.
2019-04-01 13:40:16 +10:00
Nick Mathewson
9ed02ec282
Merge branch 'ticket29662_squashed' into ticket29662_squashed_merged
2019-03-29 14:28:48 -04:00
rl1987
bf953fe602
Add changes file
2019-03-29 14:26:03 -04:00
teor
194b25f0c7
dircache: Refactor handle_get_next_bandwidth() to use connection_dir_buf_add()
...
Implements ticket 29897.
2019-03-29 17:26:30 +10:00
rl1987
c2222ba169
Add changes file
2019-03-29 17:26:09 +10:00
Nick Mathewson
a7bc47532b
test_routerkeys.c: Always check mkdir() return value
...
After this fix, we have no more unchecked mkdir() calls.
Bug 29939; CID 144254. Bugfix on 0.2.7.2-alpha.
2019-03-28 09:31:13 -04:00
rl1987
283ee0ba0a
Fix SC2086 warnings in asciidoc-helper.sh
2019-03-27 19:27:57 +02:00
George Kadianakis
00ca3d04cf
Merge branch 'tor-github/pr/859'
2019-03-27 14:30:53 +02:00
teor
8991280f89
Merge branch 'maint-0.4.0'
2019-03-27 12:31:37 +10:00
teor
6d188fb4cc
Merge remote-tracking branch 'tor-github/pr/835' into maint-0.4.0
2019-03-27 12:31:07 +10:00
teor
a10d4adc25
Stop assuming that /usr/bin/python3 exists
...
For scripts that work with python2, use /usr/bin/python.
Otherwise, use /usr/bin/env python3.
Fixes bug 29913; bugfix on 0.2.5.3-alpha.
2019-03-27 11:07:55 +10:00
Nick Mathewson
a47b61f329
Merge branch 'messaging_v3' into messaging_v3_merged
2019-03-26 20:13:49 -04:00
Nick Mathewson
3767eff9bb
changes file for pubsub code
2019-03-26 20:10:56 -04:00
teor
6d057c56f1
Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4
2019-03-27 10:01:45 +10:00
teor
c72526f168
Merge branch 'maint-0.4.0'
2019-03-27 09:36:55 +10:00
teor
9ae8d663ea
Merge remote-tracking branch 'tor-github/pr/836' into maint-0.4.0
2019-03-27 09:36:26 +10:00
George Kadianakis
989b6325d6
Merge branch 'tor-github/pr/842'
2019-03-26 16:41:07 +02:00
Nick Mathewson
f32d890531
Merge branch 'bug29805_rebased_squashed'
2019-03-26 09:39:46 -04:00
George Kadianakis
08176c2396
prob-distr: Silence some coverity warnings.
2019-03-26 09:39:37 -04:00
George Kadianakis
d11976b8bd
Merge branch 'tor-github/pr/709'
2019-03-26 15:34:54 +02:00
George Kadianakis
2790ee3685
Merge branch 'maint-0.4.0'
2019-03-26 15:16:37 +02:00
George Kadianakis
06951cb3fc
Merge branch 'tor-github/pr/847' into maint-0.4.0
2019-03-26 15:16:21 +02:00
teor
613c5ff357
Merge remote-tracking branch 'tor-github/pr/724'
2019-03-26 19:31:17 +10:00