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,757 Commits 53 Branches 631 Tags
56c54a66bdc01a9e8b857f22650ca88d8eff5466
Commit Graph

34757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 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
teor 2c4d7d8c65 Merge branch 'pr1701-fix-typo' 2020-02-06 08:39:46 +10:00
David Goulet 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
Nick Mathewson 238b1f3150 Merge remote-tracking branch 'tor-github/pr/1703' 2020-02-05 08:51:22 -05:00
George Kadianakis 2a5e641cfe Merge branch 'tor-github/pr/1704' 2020-02-04 13:09:41 +01:00
George Kadianakis 6c749bf38c Merge branch 'tor-github/pr/1700' 2020-02-04 13:06:00 +01:00
teor ff52051754 address: Fix comments in address.h 
And improve inline function spacing, and function declaration
spacing.

Comment-only change.
 2020-02-04 14:36:04 +10:00
Roger Dingledine 90bb4872b8 go in to fix one typo, end up fixing more 2020-02-03 23:21:58 -05:00
David Goulet 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
Christian Clauss 472d58372b Remove unused import UserDict 
Fixes: https://trac.torproject.org/projects/tor/ticket/32791#comment:3
Unblocks: #1686
 2020-02-03 17:55:58 +02:00
David Goulet 1bf377f4b6 Merge branch 'tor-github/pr/1687' 2020-01-30 14:06:09 -05:00
David Goulet f07d8a1a92 Merge branch 'tor-github/pr/1692' 2020-01-30 13:53:32 -05:00
David Goulet a1dec44723 Merge branch 'tor-github/pr/1697' 2020-01-30 13:48:36 -05:00
Nick Mathewson 9662a13d7e Fix a changelog typo 2020-01-30 12:56:06 -05:00
Nick Mathewson ee929eedbb Merge branch 'maint-0.4.2' 
Using "ours" strategy to avoid version bump.
 2020-01-30 11:19:41 -05:00
Nick Mathewson c5e610af05 Merge branch 'maint-0.4.1' into maint-0.4.2 
Using "ours" strategy to avoid version bump
 2020-01-30 11:19:23 -05:00
Nick Mathewson 49cffee635 bump to 0.4.2.6-dev 2020-01-30 11:19:16 -05:00
Nick Mathewson 7afb95d3e3 Bump to 0.4.1.8-dev 2020-01-30 11:18:50 -05:00
David Goulet 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
Nick Mathewson 342ea31551 copy 0.4.1.8 and 0.4.2.6 entries to master ChangeLog, ReleaseNotes. 2020-01-30 10:05:42 -05:00
Nick Mathewson af76b9dcc6 Merge branch 'bug32673_035' 2020-01-30 09:58:23 -05:00
Nick Mathewson 9ea0c0bfcd Merge branch 'bug33093_logging_035' 2020-01-30 09:55:40 -05:00
Nick Mathewson 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
Nick Mathewson 39c5e1b849 Merge branch 'maint-0.4.2' 
Use "-s ours" to avoid version bump.
 2020-01-29 19:44:34 -05:00
Nick Mathewson f470b863a0 Bump version to 0.4.2.6 2020-01-29 19:44:29 -05:00
Nick Mathewson 0fb407591b Merge branch 'maint-0.4.1' into maint-0.4.2 
"Ours" merge to avoid version bump.
 2020-01-29 19:42:43 -05:00
Nick Mathewson ec7f99e6ef bump to 0.4.1.8 2020-01-29 19:42:24 -05:00
teor c1d4399c82 Merge branch 'maint-0.4.2' 2020-01-30 07:55:20 +10:00
teor 7b6be02a92 Merge branch 'maint-0.4.1' into maint-0.4.2 2020-01-30 07:55:12 +10:00
teor 6b392c333a Merge branch 'maint-0.4.0' into maint-0.4.1 2020-01-30 07:55:05 +10:00
teor 65825018c7 Merge branch 'maint-0.3.5' into maint-0.4.0 2020-01-30 07:54:58 +10:00
teor 9b0b2aef80 Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1 2020-01-30 07:54:39 +10:00
teor 41d52e9cd8 Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5 2020-01-30 07:53:53 +10:00
Nick Mathewson 2985a6018f buf_read_from_tls: Return ERROR_MISC, not WANTWRITE, on BUG(). 
Fixes bug 32673; bugfix on 0.3.0.4-alpha.  We introduced these
checks in ee5471f9aa to help diagnose 21369, but we used "-1"
when "TOR_TLS_ERROR_MISC" would have been correct.  Found by opara.

I don't think that this is actually getting triggered in the wild,
but if it were, it could cause nasty behavior: spurious
WANTREAD/WANTWRITE returns have a way of turning into CPU-eating
busy-loops.
 2020-01-29 08:50:03 -05:00
Nick Mathewson 1f163fcbde Change BUG() messages in buf_flush_to_tls() to IF_BUG_ONCE() 
We introduced these BUG() checks in b0ddaac074 to prevent a
recurrence of bug 23690.  But there's a report of the BUG() message
getting triggered and filling up the disk.  Let's change it to
IF_BUG_ONCE().

Fixes bug 33093; bugfix on 0.3.2.2-alpha.
 2020-01-29 08:31:22 -05:00
teor f3ecf0b0a4 changes: file for 33091 2020-01-29 18:27:53 +10:00
teor c8ba2c4730 mainloop: Simplify ip_address_changed() 
Simplify ip_address_changed() by removing redundant checks
(all exits are relays, and need to rebuild their descriptor when their
IP addresses change).

Rewrite the function comment, and rename the argument, so the function
is easier to understand and use.

Closes 33091.
 2020-01-29 18:23:38 +10:00
teor d873674fb3 connection: Improve function comments 
Improve the function comments on connection_finished_connecting(),
to describe what the function actually does.

Part of 33091.
 2020-01-29 18:22:21 +10:00
Nick Mathewson 99671c0dae Merge remote-tracking branch 'tor-github/pr/1680' 2020-01-28 08:15:21 -05:00
Nick Mathewson 27099ffe6a Merge remote-tracking branch 'tor-github/pr/1689' 2020-01-28 07:55:34 -05:00
teor 9d771ccc86 Travis: Stop allowing stem test failures 
Stop allowing failures on the Travis CI stem tests job. It looks like
all the stem hangs we were seeing are now fixed, but let's make sure we
see them if they happen again.

Closes ticket 33075.
 2020-01-28 19:56:56 +10:00
cclauss 3208a74f90 Use print() function in both Python 2 and Python 3 2020-01-28 01:38:54 +01:00
David Goulet aba31e2187 Merge branch 'tor-github/pr/1683' 2020-01-27 12:04:25 -05:00
Taylor Yu f10e6b7234 changes file for ticket 33039 2020-01-24 12:20:52 -06:00
Taylor Yu 76a8a734c9 tests for ticket 33039 2020-01-24 12:20:52 -06:00
Taylor Yu f7a2b98674 fix leak in GETCONF 
Fix a memory leak introduced by refactoring of control reply
formatting code.  Fixes bug 33039; bugfix on 0.4.3.1-alpha.
 2020-01-24 12:20:47 -06:00
Nick Mathewson cda10a2e89 Git hooks: remove support for 0.2.9 directory layout. 
We no longer will be pushing or committing things in branches that
use src/common or src/or.

Resolves ticket 32957.
 2020-01-23 10:28:09 -05:00
Nick Mathewson 7c76cedf0f update doc/HACKING/ReleasingTor.md 2020-01-23 08:55:55 -05:00
Nick Mathewson e34d963c44 Bump to 0.4.3.1-alpha-dev 2020-01-22 20:30:46 -05:00
David Goulet 21d0d81d82 Merge branch 'tor-github/pr/1677' 2020-01-22 14:32:30 -05:00