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
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
f6db290e5a
Merge remote-tracking branch 'tor-github/pr/1186'
2019-07-23 12:30:19 -04:00
ef2dd1ba96
Merge branch 'tor-github/pr/1116'
2019-07-23 09:46:29 -04:00
2fce1274de
Merge branch 'tor-github/pr/1153'
2019-07-23 09:43:36 -04:00
f7dc920f4b
Merge branch 'maint-0.4.1'
2019-07-23 09:39:51 -04:00
c541258fac
Merge branch 'tor-github/pr/1158' into maint-0.4.1
2019-07-23 09:39:43 -04:00
fdfee3d06f
Changes file for #31113 .
2019-07-23 12:44:43 +03:00
aed82bf410
Add changes file for #31112 and #31098 .
2019-07-23 11:52:25 +03:00
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
8bbec36b3b
Changes file for bug 31001
2019-07-19 09:21:45 -04:00
3efe5cc57a
changes file for 30752
2019-07-18 09:28:08 -04:00
78768aafe1
Changes file for 29746.
2019-07-18 09:28:08 -04:00
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
5303dbe624
Merge branch 'tor-github/pr/1152'
2019-07-04 17:14:06 +03:00
fdbd139495
Merge remote-tracking branch 'tor-github/pr/1136'
2019-07-02 13:33:50 -04:00
cf92c096ad
Merge remote-tracking branch 'tor-github/pr/1120'
2019-07-02 13:33:37 -04:00
59e523f058
Early exit from post-merge git hook script when not merging to master
2019-07-02 20:06:23 +03:00
15e28af2d1
Merge remote-tracking branch 'dgoulet/ticket31008_035_01'
2019-07-02 13:19:40 +03:00
c0ea6f9c64
Merge branch 'maint-0.4.1'
2019-07-01 14:25:13 -04:00
5e16601000
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-07-01 14:25:12 -04:00
1dd9527897
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-07-01 14:25:12 -04:00
2a42d6be27
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-07-01 14:25:12 -04:00
7541aaf988
Merge branch 'chutney_ci_v4_040' into chutney_ci_v4_041
2019-07-01 14:36:53 +10:00
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
84f2c0affb
Merge branch 'chutney_ci_v4_029' into chutney_ci_v4_035
2019-07-01 14:33:37 +10:00
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
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
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
f446db59e1
man: Fix -help typo to --help
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-06-27 14:52:12 -04:00
George Kadianakis
David Goulet
Nick Mathewson
rl1987
teor