torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
34,844 Commits 53 Branches 631 Tags
455ea05bdfb841bfb84acdf464f497996824cd7a
Commit Graph
34844 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 455ea05bdf Rename EndOfLifeTor to ReleaseSeriesLifecycle; expand it. 
Closes ticket 30917.
 2020-02-14 08:47:17 -05:00
Nick Mathewson a6509cb867 Merge remote-tracking branch 'tor-github/pr/1727/head' 2020-02-14 08:20:21 -05:00
Nick Mathewson a010dbf94c Merge branch 'maint-0.4.3' 2020-02-14 08:17:16 -05:00
Nick Mathewson a79841fd83 Merge branch 'ticket33290_v2_042' into maint-0.4.3 2020-02-14 08:16:22 -05:00
Nick Mathewson 393bbd823e Merge branch 'ticket33290_v2_041' into ticket33290_v2_042 2020-02-14 08:16:01 -05:00
Nick Mathewson c1649ab015 Wipe the entire hashent structure, not just the first sizeof(void*) 2020-02-14 08:15:37 -05:00
teor ed1ee2001f dirvote: Update the comments for required protocols 
Add doxygen comments to the new recommended and required subprotocol
version strings.

Add a warning to the required protocol documentation, because requiring
the wrong protocols can break the tor network. Also reference
proposal 303: When and how to remove support for protocol versions.

Part of 33285.
 2020-02-14 12:49:38 +10:00
teor 98899f20ad mainloop: Explain local connections better 
Some connections aren't counted for statistics or accounting,
because they have been specifically configured by the user to
local addresses.

Comment-only change.

Closes 33201.
 2020-02-14 10:13:00 +10:00
Nick Mathewson 1ab7c05231 Merge branch 'maint-0.4.3' 2020-02-13 10:47:43 -05:00
Nick Mathewson 6c5307e42f Merge branch 'ticket33290_v2_043' into maint-0.4.3 2020-02-13 10:47:32 -05:00
Nick Mathewson 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
Nick Mathewson fd1686c7d8 Merge branch 'ticket33290_v2_041' into ticket33290_v2_042 2020-02-13 09:12:48 -05:00
Nick Mathewson fff1054d17 Before freeing ewma objects, use memwipe instead of resetting magic. 2020-02-13 09:11:35 -05:00
Nick Mathewson e231d84dd5 Merge branch 'maint-0.4.3' 2020-02-12 18:26:08 -05:00
Nick Mathewson d0c3350218 Run "make autostyle". 2020-02-12 18:25:51 -05:00
Nick Mathewson 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
Nick Mathewson 553c36d153 Merge branch 'maint-0.4.3' 2020-02-12 13:48:48 -05:00
Nick Mathewson 3147cbba52 Merge remote-tracking branch 'tor-github/pr/1728/head' into maint-0.4.3 2020-02-12 13:48:39 -05:00
Taylor Yu 0ab859aabe changes file for ticket 33188 2020-02-12 12:28:35 -06:00
swati d33c80f0ee Moved [[RephistTrackTime]] to General Options. 2020-02-12 23:17:31 +05:30
swati 809090d24d Addressed minor changes suggested in the ticket 2020-02-12 23:07:00 +05:30
Nick Mathewson 9b2e0604a9 Merge remote-tracking branch 'tor-github/pr/1726/head' 2020-02-12 08:34:17 -05:00
teor 4fed49e0dd protover: Sort tor's supported protocol versions 
As recommended by the tor directory specification.

Fixes bug 33285; bugfix on 0.4.0.1-alpha.
 2020-02-12 22:15:17 +10:00
teor 14cb337e80 test/protover: Test hard-coded protover sorting 
Make sure that the following hard-coded protocol version lists are
sorted:
  * supported protocols
  * recommended relay and client protocols
  * required relay and client protocols

This test currently fails, because the supported protocols are not
sorted.

Tests for 33285.
 2020-02-12 22:07:26 +10:00
teor 64bb6e622d dirvote: Reorder required protocol lists 
Use a consistent order, because the current order is going to trip
someone up eventually.

Preparation for 33285.
 2020-02-12 22:06:11 +10:00
teor 78051c8808 dirvote: Move required protos into private header 
Move the recommended and required protocol version lists into the
private section of the dirvote header, and turn them into macros.

Preparation for 33285.
 2020-02-12 22:03:19 +10:00
teor bc493ce0f2 protover: Update a comment about protover parsing 
Comment-only change.
 2020-02-12 20:59:25 +10:00
teor 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
teor 41a9eddf2b Merge branch 'maint-0.4.3' 2020-02-12 14:15:27 +10:00
teor e0ea7407a4 Merge remote-tracking branch 'tor-github/pr/1725' into maint-0.4.3 2020-02-12 14:14:11 +10:00
teor 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
David Goulet 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
teor ff52205362 Merge branch 'maint-0.4.1' into maint-0.4.2 2020-02-12 12:22:04 +10:00
teor 5298113da9 Merge branch 'maint-0.3.5' into maint-0.4.1 2020-02-12 12:21:57 +10:00
Alexander Færøy 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
teor 88723ad169 Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5 2020-02-12 12:18:59 +10:00
George Kadianakis 9892cc3b12 Merge branch 'tor-github/pr/1707' 2020-02-11 18:42:22 +02:00
David Goulet 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
David Goulet 2a524662c3 Merge branch 'tor-github/pr/1717' 2020-02-11 10:52:49 -05:00
Nick Mathewson 7404b6fb71 Update scripts/git/*.sh to know about 043 and not about 040. 2020-02-11 10:52:42 -05:00
Nick Mathewson de31c4757b Merge branch 'maint-0.4.2' into maint-0.4.3 2020-02-11 08:53:41 -05:00
Nick Mathewson 80c5c874cc Merge branch 'maint-0.4.3' 2020-02-11 08:53:41 -05:00
Nick Mathewson 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
Nick Mathewson 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
Nick Mathewson 384a771fcc Merge branch 'ticket32362_squashed' 2020-02-11 08:47:19 -05:00
Neel Chauhan 777d90fa23 Check for leading zeros in tor_inet_aton() 2020-02-11 08:47:13 -05:00
Nick Mathewson d9a70ba212 Merge remote-tracking branch 'tor-github/pr/1690/head' 2020-02-11 08:45:25 -05:00
Nick Mathewson 48bf3aec25 Merge branch 'maint-0.4.3' 2020-02-11 08:44:39 -05:00
Nick Mathewson 409e1ca3d5 Merge remote-tracking branch 'tor-github/pr/1716/head' into maint-0.4.3 2020-02-11 08:44:18 -05:00
Nick Mathewson 1ca6c52209 Merge branch 'maint-0.4.3' 2020-02-11 08:35:22 -05:00