summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-04-24Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-04-24Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-04-24Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1Nick Mathewson
2018-04-23Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-04-23Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-04-23Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-04-23Merge branch 'bug24969_029_v2' into maint-0.2.9Nick Mathewson
2018-04-23Permit the nanosleep system call in the seccomp2 callboxNick Mathewson
Fixes bug 24969; bugfix on 0.2.5.1-alpha when the sandbox was introduced.
2018-04-22Allow cpuworkers to exist without onion keysNick Mathewson
Now that we allow cpuworkers for dirport-only hosts (to fix 23693), we need to allow dup_onion_keys() to succeed for them. The change to construct_ntor_key_map() is for correctness, but is not strictly necessary.
2018-04-20Fix documentation bug 25857: the universe is ::/0, not ::/128Nick Mathewson
Patch from CTassisF.
2018-04-17Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-04-17Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-04-17Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-04-17heartbeat: Log the number of circuits killed because too many cellsDavid Goulet
We recently merged a circuit cell queue size safeguard. This commit adds the number of killed circuits that have reached the limit to the DoS heartbeat. It now looks like this: [notice] DoS mitigation since startup: 0 circuits killed with too many cells. 0 circuits rejected, 0 marked addresses. 0 connections closed. 0 single hop clients refused. Second thing that this patch does. It makes tor always print the DoS mitigation heartbeat line (for a relay) even though no DoS mitigation have been enabled. The reason is because we now kill circuits that have too many cells regardless on if it is enabled or not but also it will give the operator a chance to learn what is enabled with the heartbeat instead of suddenly appearing when it is enabled by let say the consensus. Fixes #25824 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-16Add support for the coveralls.io coverage tool in travis configNick Mathewson
Closes ticket 25818.
2018-04-16Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-04-16Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-04-16Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-04-16Fix an LCOV exclusion pattern in address.cNick Mathewson
2018-04-16Merge remote-tracking branch 'dgoulet/bug25226_033_02' into maint-0.3.3Nick Mathewson
2018-04-16relay: Implement a circuit cell queue maximum sizeDavid Goulet
This commit introduces the consensus parameter "circ_max_cell_queue_size" which controls the maximum number of cells a circuit queue should have. The default value is currently 50000 cells which is above what should be expected but keeps us a margin of error for padding cells. Related to this is #9072. Back in 0.2.4.14-alpha, we've removed that limit due to a Guard discovery attack. Ticket #25226 details why we are putting back the limit due to the memory pressure issue on relays. Fixes #25226 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-15bump to 0.3.3.5-rc-devNick Mathewson
2018-04-14bump to 0.3.3.5-rcNick Mathewson
2018-04-13Merge remote-tracking branch 'dgoulet/ticket25248_033_02' into maint-0.3.3Nick Mathewson
2018-04-13doc: Fix typo and clarify that DoS options are relay onlyMike Perry
2018-04-13doc: Move DOS options below SERVER optionsDavid Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-13doc: Improve DoS section of the man page tor.1David Goulet
Add to the Denial of Service section of the man page an explanation about the three different mitigation Tor has. Fixes #25248. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-12Refine extend_info_for_node's "enough info" check once again.Nick Mathewson
In d1874b433953f64, we adjusted this check so that we insist on using routerinfos for bridges. That's almost correct... but if we have a bridge that is also a regular relay, then we should use insist on its routerinfo when connecting to it as a bridge (directly), and be willing to use its microdescriptor when connecting to it elsewhere in our circuits. This bug is a likely cause of some (all?) of the (exit_ei == NULL) failures we've been seeing. Fixes bug 25691; bugfix on 0.3.3.4-alpha
2018-04-12Attempt to fix 32-bit clang builds, which broke with 31508a0abccfee1cdNick Mathewson
When size_t is 32 bits, the unit tests can't fit anything more than 4GB-1 into a size_t. Additionally, tt_int_op() uses "long" -- we need tt_u64_op() to safely test uint64_t values for equality. Bug caused by tests for #24782 fix; not in any released Tor.
2018-04-12Attempt to fix 32-bit builds, which broke with 31508a0abccfee1cdNick Mathewson
When size_t is 32 bits, doing "size_t ram; if (ram > 8GB) { ... }" produces a compile-time warning. Bug caused by #24782 fix; not in any released Tor.
2018-04-12Use less memory for MaxMemInQueues for machines with more than 8 GB of RAM.Alexander Færøy
This patch changes the algorithm of compute_real_max_mem_in_queues() to use 0.4 * RAM iff the system has more than or equal to 8 GB of RAM, but will continue to use the old value of 0.75 * RAM if the system have less than * GB of RAM available. This patch also adds tests for compute_real_max_mem_in_queues(). See: https://bugs.torproject.org/24782
2018-04-12Use STATIC for compute_real_max_mem_in_queuesAlexander Færøy
This patch makes compute_real_max_mem_in_queues use the STATIC macro, which allows us to test the function. See: https://bugs.torproject.org/24782
2018-04-12Make get_total_system_memory mockable.Alexander Færøy
This patch makes get_total_system_memory mockable, which allows us to alter the return value of the function in tests. See: https://bugs.torproject.org/24782
2018-04-11Merge branch 'bug25581_033_v2_asn_squashed' into maint-0.3.3Nick Mathewson
2018-04-11Rename HSLayer{2,3}Nodes to start without an underscore.Nick Mathewson
The old single-underscore names remain as a deprecated synonym. Fixes bug 25581; bugfix on 0.3.3.1-alpha.
2018-04-11Bug 24989: Count client hsdir gets towards MaxClientCircuitsPending.Mike Perry
We removed this by breaking them out from general in #13837.
2018-04-10Fix another crash-on-no-threadpool bug.Nick Mathewson
This one happens if for some reason you start with DirPort enabled but server mode turned off entirely. Fixes a case of bug 23693; bugfix on 0.3.1.1-alpha.
2018-04-10Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-04-10Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-04-10Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-04-10Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9Nick Mathewson
2018-04-09Lift the list of default directory servers into their own file.Alexander Færøy
This patch lifts the list of default directory authorities from config.c into their own auth_dirs.inc file, which is then included in config.c using the C preprocessor. Patch by beastr0. See: https://bugs.torproject.org/24854
2018-04-06Ship all files needed to build Tor with rustNick Mathewson
Fixes bug 25732; bugfix on 0.3.3.2-alpha when strings.rs was introduced.
2018-04-05Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-04-05Merge branch 'ticket25296_032_squashed' into maint-0.3.2Nick Mathewson
2018-04-05PerConnBW{Rate,Burst} docs: do not say consensus param is always setNick Mathewson
Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage entries were introduced.
2018-04-05Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-04-05Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-04-05Switch Travis to stable rustTaylor Yu
2018-04-05Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson