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
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
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
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
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
