691d271b2e
Re-order thread initialization to follow logging, and remove a comment.
...
lib/log no longer uses lib/thread; lib/log only uses lib/lock, which
is at a lower level.
2020-02-13 12:55:05 -05:00
67d59d7d1f
Re-order most subsystems to correspond to dependency order.
2020-02-13 12:53:15 -05:00
1ab7c05231
Merge branch 'maint-0.4.3'
2020-02-13 10:47:43 -05:00
6c5307e42f
Merge branch 'ticket33290_v2_043' into maint-0.4.3
2020-02-13 10:47:32 -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
fff1054d17
Before freeing ewma objects, use memwipe instead of resetting magic.
2020-02-13 09:11:35 -05:00
e231d84dd5
Merge branch 'maint-0.4.3'
2020-02-12 18:26:08 -05:00
d0c3350218
Run "make autostyle".
2020-02-12 18:25:51 -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
d33c80f0ee
Moved [[RephistTrackTime]] to General Options.
2020-02-12 23:17:31 +05:30
809090d24d
Addressed minor changes suggested in the ticket
2020-02-12 23:07:00 +05:30
9b2e0604a9
Merge remote-tracking branch 'tor-github/pr/1726/head'
2020-02-12 08:34:17 -05:00
bc493ce0f2
protover: Update a comment about protover parsing
...
Comment-only change.
2020-02-12 20:59:25 +10: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
41a9eddf2b
Merge branch 'maint-0.4.3'
2020-02-12 14:15:27 +10:00
e0ea7407a4
Merge remote-tracking branch 'tor-github/pr/1725' into maint-0.4.3
2020-02-12 14:14:11 +10:00
0e00d9369f
Merge branch 'maint-0.4.2' into maint-0.4.3
...
"ours" merge, because simiar BridgeDistribution fixes have already
been merged to maint-0.4.3. (See 32753.)
The stem changes in 33075 have already been merged to maint-0.4.3,
so this "ours" merge does not affect them.
2020-02-12 14:13:15 +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
2a524662c3
Merge branch 'tor-github/pr/1717'
2020-02-11 10:52:49 -05:00
7404b6fb71
Update scripts/git/*.sh to know about 043 and not about 040.
2020-02-11 10:52:42 -05:00
de31c4757b
Merge branch 'maint-0.4.2' into maint-0.4.3
2020-02-11 08:53:41 -05:00
80c5c874cc
Merge branch 'maint-0.4.3'
2020-02-11 08:53:41 -05:00
00fe214729
Merge branch 'maint-0.4.1' into maint-0.4.2
...
"ours" merge, since the exceptions.txt file is already fixed in this branch.
2020-02-11 08:53:00 -05:00
0ff3e8f4a0
Remove a redundant practracker exception line in maint-0.4.1
...
This will our "git push" hook not complain about pushing from
maint-0.4.1.
2020-02-11 08:52:26 -05:00
384a771fcc
Merge branch 'ticket32362_squashed'
2020-02-11 08:47:19 -05:00
777d90fa23
Check for leading zeros in tor_inet_aton()
2020-02-11 08:47:13 -05:00
d9a70ba212
Merge remote-tracking branch 'tor-github/pr/1690/head'
2020-02-11 08:45:25 -05:00
48bf3aec25
Merge branch 'maint-0.4.3'
2020-02-11 08:44:39 -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
1ca6c52209
Merge branch 'maint-0.4.3'
2020-02-11 08:35:22 -05:00
9f7e1ccacb
Undefined name: make_key() -> make_rsa_key()
2020-02-11 08:35:11 -05:00
71d96cefc0
Update to 0.4.4.0-alpha-dev
2020-02-10 19:43:54 -05:00
dac185edba
Merge branch 'maint-0.4.3'
...
"ours" merge to avoid version bump.
2020-02-10 19:43:17 -05:00
5d56c1f4b2
Update to 0.4.3.2-alpha-dev
2020-02-10 19:42:31 -05:00
dfa1800c7f
changes file for ticket 33213
2020-02-10 14:24:44 -06:00
725b0528e3
Alphabetized Server Options and Directory Server Options
2020-02-11 01:41:43 +05:30
dcbf6611d9
Correction to changelog from dgoulet
2020-02-10 15:02:32 -05:00
2571d8e7fe
One more light changelog edit.
2020-02-10 15:01:02 -05:00
f275a9ada7
Light edits on the 0.4.3.2-alpha changelog
2020-02-10 14:40:19 -05:00
a0ca442b79
start on 0.4.3.2-alpha changelog
2020-02-10 14:30:36 -05:00
Nick Mathewson
Taylor Yu
swati
teor
David Goulet
Alexander Færøy
George Kadianakis
Neel Chauhan
Christian Clauss