1ab7c05231
Merge branch 'maint-0.4.3'
2020-02-13 10:47:43 -05:00
baeff46d36
Merge branch 'ticket33290_v2_042' into ticket33290_v2_043
...
Conflicts:
src/core/or/circuitmux_ewma.c
2020-02-13 09:21:47 -05:00
fd1686c7d8
Merge branch 'ticket33290_v2_041' into ticket33290_v2_042
2020-02-13 09:12:48 -05:00
80e3dc4727
Use more memory poisoning and better asserts around ewma code
...
Attempt to diagnose 32464; fixes 33290.
2020-02-12 14:17:19 -05:00
553c36d153
Merge branch 'maint-0.4.3'
2020-02-12 13:48:48 -05:00
3147cbba52
Merge remote-tracking branch 'tor-github/pr/1728/head' into maint-0.4.3
2020-02-12 13:48:39 -05:00
0ab859aabe
changes file for ticket 33188
2020-02-12 12:28:35 -06:00
99d957696b
scripts/git: Stop running the checked-out git scripts
...
Stop executing the checked-out pre-commit hook from the pre-push hook.
Instead, execute the copy in the user's git dir.
Fixes bug 33284; bugfix on 0.4.1.1-alpha.
2020-02-12 20:37:21 +10:00
e0ea7407a4
Merge remote-tracking branch 'tor-github/pr/1725' into maint-0.4.3
2020-02-12 14:14:11 +10:00
88489cd290
hs-v3: Remove BUG() that can occur normally
...
Fixes #28992
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-02-12 14:09:40 +10:00
ff52205362
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-02-12 12:22:04 +10:00
5298113da9
Merge branch 'maint-0.3.5' into maint-0.4.1
2020-02-12 12:21:57 +10:00
b9c7c61ea5
Lowercase the BridgeDistribution value from torrc in descriptors.
...
This patch ensures that we always lowercase the BridgeDistribution from
torrc in descriptors before submitting it.
See: https://bugs.torproject.org/32753
2020-02-12 12:21:41 +10:00
88723ad169
Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5
2020-02-12 12:18:59 +10:00
9892cc3b12
Merge branch 'tor-github/pr/1707'
2020-02-11 18:42:22 +02:00
40a321659a
hs-v3: Remove BUG() that can occur normally
...
Fixes #28992
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-02-11 18:40:55 +02:00
d9a70ba212
Merge remote-tracking branch 'tor-github/pr/1690/head'
2020-02-11 08:45:25 -05:00
409e1ca3d5
Merge remote-tracking branch 'tor-github/pr/1716/head' into maint-0.4.3
2020-02-11 08:44:18 -05:00
dfa1800c7f
changes file for ticket 33213
2020-02-10 14:24:44 -06:00
a0ca442b79
start on 0.4.3.2-alpha changelog
2020-02-10 14:30:36 -05:00
eb8841cd95
Merge branch 'bug33104_041'
2020-02-10 14:23:13 -05:00
0c90fc37ec
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-02-10 14:17:10 -05:00
71c49f7356
Merge branch 'maint-0.4.0' into maint-0.4.1
2020-02-10 14:17:10 -05:00
d9144700af
Merge branch 'maint-0.4.2'
2020-02-10 14:17:10 -05:00
f3fa22bf1b
Merge branch 'maint-0.3.5' into maint-0.4.0
2020-02-10 14:17:09 -05:00
99d044d553
Fix a Rust compilation warning; resolve bug 33212.
2020-02-10 13:32:09 -05:00
05a05773f2
Merge remote-tracking branch 'tor-github/pr/1711'
2020-02-10 10:23:50 -05:00
cb757b30a2
changes file for tickets 32928, 32929
2020-02-07 12:54:55 -06:00
21f45197a2
Merge branch 'bug33103'
2020-02-06 08:28:25 -05:00
b7bbff0c9c
Merge remote-tracking branch 'public/practracker_regen_overbroad_2'
2020-02-06 08:27:12 -05:00
9278a24729
hs-v3: Remove descriptor when we remove client authorization
...
When the ONION_CLIENT_AUTH_REMOVE command is given to tor, now also remove the
descriptor associated with the client authorization credentials.
Fixes #33148
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-02-06 12:54:54 +02:00
56c54a66bd
Fix a memory leak in handling GETINFO.
...
Fixes bug 33103; bugfix on 0.4.3.1-alpha.
2020-02-05 19:18:32 -05:00
2c4d7d8c65
Merge branch 'pr1701-fix-typo'
2020-02-06 08:39:46 +10:00
9c33d36113
configure: Fix and improve summary pretty printing
...
Fixes #32230
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-02-06 08:39:04 +10:00
2a5e641cfe
Merge branch 'tor-github/pr/1704'
2020-02-04 13:09:41 +01:00
6c749bf38c
Merge branch 'tor-github/pr/1700'
2020-02-04 13:06:00 +01:00
2542a24b63
practracker: add a --regen-overbroad option to remove overbroad exceptions.
...
Closes ticket 32372.
2020-02-03 13:02:12 -05:00
08f31e405d
hs-v3: Purge ephemeral client auth on NEWNYM
...
Fixes #33139 .
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-02-03 11:58:43 -05:00
f07d8a1a92
Merge branch 'tor-github/pr/1692'
2020-01-30 13:53:32 -05:00
a1dec44723
Merge branch 'tor-github/pr/1697'
2020-01-30 13:48:36 -05:00
e4245e2a6b
hs-v2: Turn logs into protocol warning
...
All of those can be triggered remotely so change them to protocol warnings.
Fixes #32706
Signed-off-by: David Goulet <dgoulet@torproject.org >
2020-01-30 11:14:50 -05:00
af76b9dcc6
Merge branch 'bug32673_035'
2020-01-30 09:58:23 -05:00
9ea0c0bfcd
Merge branch 'bug33093_logging_035'
2020-01-30 09:55:40 -05:00
2a1f8ea2e7
Do not set "once" when calling tor_bug_occurred_ from BUG().
...
The "once" flag makes tor_bug_occurred_() say that future instances
of the warning will be suppressed -- but that's not something that
BUG() does. Fixes bug 33095; bugfix on 0.4.1.1-alpha.
2020-01-30 09:43:34 -05:00
7bd671811e
Rewrite control_event_signal() to use signal_table.
...
When we added the ACTIVE and DORMANT virtual signals, we taught the
signal command to handle them, but we didn't teach SIGNAL event to
report them.
To solve this problem and prevent it from recurring, this patch
revises the implementation of control_event_signal() to use the same
signal_table that handle_control_signal() uses. This way, the two
controller commands can't become out of sync.
Fixes bug 33104; bugfix on 0.4.0.1-alpha.
2020-01-30 09:29:07 -05:00
7b6be02a92
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-01-30 07:55:12 +10:00
6b392c333a
Merge branch 'maint-0.4.0' into maint-0.4.1
2020-01-30 07:55:05 +10:00
65825018c7
Merge branch 'maint-0.3.5' into maint-0.4.0
2020-01-30 07:54:58 +10:00
9b0b2aef80
Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1
2020-01-30 07:54:39 +10:00
41d52e9cd8
Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5
2020-01-30 07:53:53 +10:00
Nick Mathewson
Taylor Yu
teor
David Goulet
Alexander Færøy
George Kadianakis