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
27,081 Commits 53 Branches 631 Tags
6a35e7d69abfc7394bb673a2e3c338cc4ee2c1dd
Commit Graph
27081 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 6a35e7d69a Merge branch 'maint-0.3.2' into release-0.3.2 2018-02-13 08:50:59 -05:00
Nick Mathewson b062730a11 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-02-13 08:50:59 -05:00
Nick Mathewson 17a923941a Merge branch 'maint-0.2.9' into maint-0.3.1 2018-02-13 08:50:58 -05:00
David Goulet e658dad625 dirserv: Improve returned message when relay is rejected 
Explicitly inform the operator of the rejected relay to set a valid email
address in the ContactInfo field and contact bad-relays@ mailing list.

Fixes #25170

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-02-13 08:47:42 -05:00
Nick Mathewson 3fda19ef24 Merge branch 'maint-0.3.2' into release-0.3.2 2018-02-12 08:33:48 -05:00
Nick Mathewson 021c3bd587 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-02-12 08:33:47 -05:00
Nick Mathewson 91109bc813 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-02-12 08:33:47 -05:00
Nick Mathewson e91bae66d8 Merge branch 'bug23318-redux_029' into maint-0.2.9 2018-02-12 08:33:03 -05:00
Nick Mathewson 1a877693da Merge branch 'maint-0.3.2' into release-0.3.2 2018-02-11 18:11:04 -05:00
Nick Mathewson 98fc8cd937 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-02-11 18:11:04 -05:00
Nick Mathewson b2c4d4e7fa Merge branch 'maint-0.2.9' into maint-0.3.1 2018-02-11 18:11:04 -05:00
Nick Mathewson 84c13336c4 Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9 2018-02-11 18:10:59 -05:00
Nick Mathewson 2a24ce9656 Merge branch 'maint-0.3.2' into release-0.3.2 2018-02-11 18:09:35 -05:00
Nick Mathewson 67043d957f Merge branch 'maint-0.3.1' into maint-0.3.2 2018-02-11 18:09:35 -05:00
Nick Mathewson 8939eaf479 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-02-11 18:09:35 -05:00
Nick Mathewson 848ba26c18 Merge branch 'ticket24315_029' into maint-0.2.9 2018-02-11 18:07:37 -05:00
Nick Mathewson 9e81221c96 Merge branch 'maint-0.3.2' into release-0.3.2 2018-02-11 17:01:00 -05:00
Nick Mathewson 684d57fe8a Merge branch 'maint-0.3.1' into maint-0.3.2 2018-02-11 17:00:52 -05:00
Nick Mathewson eccef6ba60 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-02-11 16:51:56 -05:00
Nick Mathewson 5dc785ceef Merge remote-tracking branch 'public/bug21074_029' into maint-0.2.9 2018-02-11 16:51:53 -05:00
Nick Mathewson cb3c1f2e54 Merge branch 'maint-0.3.2' into release-0.3.2 2018-02-10 16:09:01 -05:00
Nick Mathewson 4de20d1754 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-02-10 16:09:01 -05:00
Nick Mathewson 86583ad78e Merge branch 'maint-0.2.9' into maint-0.3.1 2018-02-10 16:09:00 -05:00
Nick Mathewson 320dac4602 Merge branch 'bug24978_029_enable' into maint-0.2.9 2018-02-10 16:08:58 -05:00
Nick Mathewson 67127dca57 Merge branch 'maint-0.3.2' into release-0.3.2 2018-02-08 10:29:06 -05:00
Nick Mathewson 84bc75b2e7 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-02-08 10:29:06 -05:00
Nick Mathewson 04a8e81fa9 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-02-08 10:29:05 -05:00
Nick Mathewson 0ddc2dc531 Merge branch 'maint-0.2.5' into maint-0.2.9 2018-02-08 10:29:05 -05:00
Karsten Loesing f1278b7e57 Update geoip and geoip6 to the February 7 2018 database. 2018-02-08 10:32:41 +01:00
Nick Mathewson f5e37b2eb6 Merge branch 'maint-0.3.2' into release-0.3.2 2018-02-02 12:03:54 -05:00
Nick Mathewson 4ceae7c6b9 Merge branch 'bug25125_032_01_squashed' into maint-0.3.2 2018-02-02 12:03:48 -05:00
David Goulet 005e228f80 sched: When releasing a channel, do not BUG() if absent from the pending list 
The current code flow makes it that we can release a channel in a PENDING
state but not in the pending list. This happens while the channel is being
processed in the scheduler loop.

Fixes #25125

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-02-02 12:03:27 -05:00
Nick Mathewson 90716e3f9c Merge branch 'maint-0.3.2' into release-0.3.2 2018-02-01 16:58:03 -05:00
Nick Mathewson 77634795b0 Merge remote-tracking branch 'dgoulet/bug24700_032_01' into maint-0.3.2 2018-02-01 16:57:57 -05:00
Nick Mathewson cb5654f300 sched: Use the sched_heap_idx field to double-check our fix for 24700. 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-02-01 16:00:59 -05:00
Nick Mathewson 1a4876587e Merge branch 'maint-0.3.2' into release-0.3.2 2018-02-01 15:28:17 -05:00
Nick Mathewson 31542cc306 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-02-01 15:28:17 -05:00
Nick Mathewson 9cbc40e376 Merge remote-tracking branch 'teor/bug25070_031' into maint-0.3.1 2018-02-01 15:28:11 -05:00
Nick Mathewson df37b93336 Merge branch 'maint-0.3.2' into release-0.3.2 2018-02-01 08:15:18 -05:00
Nick Mathewson 61cb2993dd Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2 2018-02-01 08:10:34 -05:00
Nick Mathewson a877241e6c Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-31 14:33:46 -05:00
Nick Mathewson 56857291b0 Merge branch 'bug25105_032' into maint-0.3.2 2018-01-31 14:33:12 -05:00
David Goulet fbc455cbd2 ns: Add a before and after consensus has changed notification 
In 0.3.2.1-alpha, we've added notify_networkstatus_changed() in order to have
a way to notify other subsystems that the consensus just changed. The old and
new consensus are passed to it.

Before this patch, this was done _before_ the new consensus was set globally
(thus NOT accessible by getting the latest consensus). The scheduler
notification was assuming that it was set and select_scheduler() is looking at
the latest consensus to get the parameters it might needs. This was very wrong
because at that point it is still the old consensus set globally.

This commit changes the notify_networkstatus_changed() to be the "before"
function and adds an "after" notification from which the scheduler subsystem
is notified.

Fixes #24975
 2018-01-31 14:15:02 -05:00
Nick Mathewson 31f2a8771c Look at the correct protocol for supports_v3_rendezvous_point 
Fixes bug 25105; bugfix on 0.3.2.1-alpha.

(This is a backport of bbf2d9cf6b for 0.3.2.)
 2018-01-31 14:09:47 -05:00
David Goulet c85f78e74c Revert "ns: Call notify_networkstatus_changed() after the new consensus is set globally" 
This reverts commit 3a247ca92a.
 2018-01-31 13:59:05 -05:00
Nick Mathewson 2485f8dea4 Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-31 13:47:01 -05:00
Nick Mathewson 1c39d969b9 Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2 2018-01-31 13:46:58 -05:00
David Goulet adaf3e9b89 sched: Avoid adding the same channel twice to the KIST pending list 
This is the quick fix that is keeping the channel in PENDING state so if we
ever try to reschedule the same channel, it won't happened.

Fixes #24700

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-01-31 13:46:31 -05:00
Nick Mathewson c35416ab8f Merge branch 'maint-0.3.2' into release-0.3.2 2018-01-31 12:51:45 -05:00
David Goulet df312b3cf6 hs-v3: Remove a BUG() when storing a descriptor in the client cache 
It is possible in normal circumstances that  a client fetches a descriptor
that has a lower revision counter than the one in its cache. This can happen
due to HSDir desync.

Fixes #24976

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-01-31 12:51:42 -05:00