53d5b67f07
Merge branch 'ticket31374_035' into maint-0.4.1
2019-08-08 15:24:52 -04:00
0312da75a3
Merge branch 'tor-github/pr/1172'
2019-08-08 12:26:59 -04:00
b560d94ac0
Merge branch 'ticket31374_029' into ticket31374_035
2019-08-08 11:46:24 -04:00
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
71e5af0221
pre-push hook: Only run practracker when a special file is present
...
Closes ticket 30979.
2019-08-08 11:36:05 -04:00
a8f936c817
Merge branch 'maint-0.4.1'
2019-08-08 11:24:08 -04:00
0bc5b7ae95
Merge branch 'ticket31343_040' into maint-0.4.1
2019-08-08 11:23:59 -04:00
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
fcb4d273fb
Merge branch 'doc31089_040' into doc31089_041
2019-08-08 23:07:22 +10:00
c3d6c75945
Merge branch 'doc31089_035' into doc31089_040
2019-08-08 23:07:17 +10:00
25f39bdfc4
Merge branch 'doc31089_029' into doc31089_035
2019-08-08 23:07:12 +10:00
1087c48d6e
Hardcode the image into tor-exit-notice.html
2019-08-08 22:46:51 +10:00
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
0acfd7dcee
Merge branch 'maint-0.4.1'
2019-08-08 11:20:07 +10:00
40d7f1e3a6
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-08-08 11:19:58 +10:00
0a661cde1d
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-08 11:19:38 +10:00
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
97e7be2717
Merge remote-tracking branch 'tor-github/pr/1157' into maint-0.4.0
2019-08-08 11:07:34 +10:00
e15b9b1790
Merge remote-tracking branch 'tor-github/pr/1156' into maint-0.3.5
2019-08-08 11:07:11 +10:00
8d22c09abf
Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9
2019-08-08 10:55:24 +10:00
518b69b57c
Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9
2019-08-08 10:54:12 +10:00
25c97b18f1
changes file for ticket 31320
2019-08-06 13:13:36 -04:00
79569d86b3
Merge branch 'ticket31343_035' into ticket31343_040
2019-08-06 11:18:40 -04:00
bc9492a938
Merge branch 'ticket31343_029' into ticket31343_035
2019-08-06 11:15:20 -04:00
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
21531f35f3
Merge branch 'ticket31311_041' into maint-0.4.1
2019-08-06 09:19:05 -04:00
d7afdb3b0f
Merge branch 'tor-github/pr/1195'
2019-08-06 14:51:47 +03:00
4ee65a6f87
Merge branch 'tor-github/pr/1193'
2019-08-06 07:42:20 -04:00
d515b0f4ba
changes file for ticket 31176
2019-08-05 17:48:06 -04:00
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
54ad92a240
Merge branch 'maint-0.4.1'
2019-08-05 09:59:40 -04:00
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
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
49c696fb46
Merge branch 'ticket31311_041' into ticket31304
2019-08-01 13:48:58 -04:00
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
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
c4864de573
Merge branch 'tor-github/pr/1177'
2019-08-01 10:18:10 -04:00
19536fd18d
practracker: replaces "overstrict" with "overbroad"
...
I had the logic reversed here.
2019-08-01 09:35:33 -04:00
6dba86d7c9
Merge branch 'maint-0.4.1'
2019-07-29 12:02:54 -04:00
1d6054f750
Merge branch 'tor-github/pr/1179' into maint-0.4.1
2019-07-29 12:02:47 -04:00
044bb019b6
Merge branch 'maint-0.4.1'
2019-07-25 10:27:41 -04:00
af26cd6101
Always check the retval of circpad_machine_current_state().
2019-07-25 10:24:23 -04:00
bd1ac408d8
Remove dead code from circpad_machine_remove_token().
2019-07-25 10:24:19 -04:00
cfb15d513d
Merge branch 'maint-0.4.1'
2019-07-25 09:03:01 -04:00
2a4b156978
Merge branch 'tor-github/pr/1171' into maint-0.4.1
2019-07-25 09:02:53 -04:00
2944b091fc
Merge branch 'maint-0.4.1'
2019-07-24 12:32:06 +03:00
bb33a2f290
Merge branch 'tor-github/pr/1181' into maint-0.4.1
2019-07-24 12:31:56 +03:00
91f04d006b
Merge branch 'tor-github/pr/1165'
2019-07-24 12:29:57 +03:00
ab1f82ea2a
Merge branch 'ticket24963_042_02'
2019-07-23 14:03:30 -04:00
ab1f39322c
Merge remote-tracking branch 'tor-github/pr/1185'
2019-07-23 12:32:14 -04:00
Nick Mathewson
David Goulet
teor
rl1987
George Kadianakis