]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
7 years agoAdd support for openssl built with "no-deprecated".
Nick Mathewson [Wed, 18 Apr 2018 16:31:24 +0000 (12:31 -0400)] 
Add support for openssl built with "no-deprecated".

Patch from Andrew John Hughes; partial fix for 19981.

7 years agoEdit our openssl detection in autoconf to tolerate no-deprecated.
Nick Mathewson [Mon, 5 Mar 2018 20:34:04 +0000 (15:34 -0500)] 
Edit our openssl detection in autoconf to tolerate no-deprecated.

When openssl is built with no-deprecated, the TLSv1_1_method()
function isn't visible in the headers.  That's sad, because that
method is what we were looking at.

Instead, we now look at SSL_CIPHER_get_id(), which is present in
OpenSSL 1.0.1 and later, which is _not_ deprecated, and which is
also present in LibreSSL.

Fixes ticket 25353.  Not a bugfix exactly -- we never really worked
with this configuration.

7 years agoFix a pointer size error in test_bridges.c
Nick Mathewson [Tue, 17 Apr 2018 23:44:09 +0000 (19:44 -0400)] 
Fix a pointer size error in test_bridges.c

sizeof(ret) is the size of the pointer, not the size of what it
points to.  Fortunately, we already have a function to compare
tor_addr_port_t values for equality.

Bugfix on c2c5b13e5d8a77e; bug not in any released Tor. Found by
clang's scan-build.

7 years agoAdd an initialization case to node_get_prim_dirport
Nick Mathewson [Tue, 17 Apr 2018 23:41:51 +0000 (19:41 -0400)] 
Add an initialization case to node_get_prim_dirport

Fixes a bug found by scan-build; bugfix on c2fa743806acc. Bug not in
any released Tor.

7 years agoAdd a redundant memset to node_get_pref_ipv6_orport()
Nick Mathewson [Tue, 17 Apr 2018 23:41:10 +0000 (19:41 -0400)] 
Add a redundant memset to node_get_pref_ipv6_orport()

For whatever reason, clang's scan-build isn't sure that this
function actually initializes its output.

7 years agoFix a copy-and-paste error from 6be994fa717cf73
Nick Mathewson [Tue, 17 Apr 2018 23:39:50 +0000 (19:39 -0400)] 
Fix a copy-and-paste error from 6be994fa717cf73

Found by clang's scan-build too.  Bug not in any released Tor.

7 years agoFixup timing wheel warnings related to recent WHEEL_BIT change.
Nick Mathewson [Tue, 17 Apr 2018 16:45:53 +0000 (12:45 -0400)] 
Fixup timing wheel warnings related to recent WHEEL_BIT change.

7 years agotoken bucket: Add parens to rate_per_sec_to_rate_per_step()
Nick Mathewson [Tue, 17 Apr 2018 15:09:55 +0000 (11:09 -0400)] 
token bucket: Add parens to rate_per_sec_to_rate_per_step()

Typecasts bind more tightly than division, so we need to do the
division first.

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Tue, 17 Apr 2018 14:48:18 +0000 (10:48 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Tue, 17 Apr 2018 14:48:18 +0000 (10:48 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Tue, 17 Apr 2018 14:48:18 +0000 (10:48 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Tue, 17 Apr 2018 14:47:30 +0000 (10:47 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Tue, 17 Apr 2018 14:45:58 +0000 (10:45 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoheartbeat: Log the number of circuits killed because too many cells
David Goulet [Tue, 17 Apr 2018 12:38:34 +0000 (08:38 -0400)] 
heartbeat: Log the number of circuits killed because too many cells

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>
7 years agoMerge remote-tracking branch 'public/bug24688'
Nick Mathewson [Tue, 17 Apr 2018 13:14:44 +0000 (09:14 -0400)] 
Merge remote-tracking branch 'public/bug24688'

7 years agotoken: Fix uint32_t to uint64_t conversion
David Goulet [Mon, 16 Apr 2018 19:02:51 +0000 (15:02 -0400)] 
token: Fix uint32_t to uint64_t conversion

Unfortunately, the units passed to
monotime_coarse_stamp_units_to_approx_msec() was always 0 due to a type
conversion.

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoAdd support for the coveralls.io coverage tool in travis config
Nick Mathewson [Mon, 16 Apr 2018 18:42:28 +0000 (14:42 -0400)] 
Add support for the coveralls.io coverage tool in travis config

Closes ticket 25818.

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Mon, 16 Apr 2018 17:48:39 +0000 (13:48 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Mon, 16 Apr 2018 17:48:23 +0000 (13:48 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Mon, 16 Apr 2018 17:48:23 +0000 (13:48 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Mon, 16 Apr 2018 17:48:23 +0000 (13:48 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoFix an LCOV exclusion pattern in address.c
Nick Mathewson [Mon, 16 Apr 2018 17:48:21 +0000 (13:48 -0400)] 
Fix an LCOV exclusion pattern in address.c

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Mon, 16 Apr 2018 14:06:21 +0000 (10:06 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge remote-tracking branch 'dgoulet/bug25226_033_02' into maint-0.3.3
Nick Mathewson [Mon, 16 Apr 2018 14:04:36 +0000 (10:04 -0400)] 
Merge remote-tracking branch 'dgoulet/bug25226_033_02' into maint-0.3.3

7 years agorelay: Implement a circuit cell queue maximum size
David Goulet [Tue, 20 Mar 2018 19:27:58 +0000 (15:27 -0400)] 
relay: Implement a circuit cell queue maximum size

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>
7 years agoRemove old tor-fw-helper README from EXTRA_DIST
Nick Mathewson [Mon, 16 Apr 2018 13:52:15 +0000 (09:52 -0400)] 
Remove old tor-fw-helper README from EXTRA_DIST

We removed this file, but didn't take it out of EXTRA_DIST -- thus
breaking "make dist".

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Sun, 15 Apr 2018 19:41:10 +0000 (15:41 -0400)] 
Merge branch 'maint-0.3.3'

"ours" to avoid version bump.

7 years agobump to 0.3.3.5-rc-dev
Nick Mathewson [Sun, 15 Apr 2018 19:41:03 +0000 (15:41 -0400)] 
bump to 0.3.3.5-rc-dev

7 years agocopy 0.3.3.5-rc changelog to master.
Nick Mathewson [Sun, 15 Apr 2018 19:40:01 +0000 (15:40 -0400)] 
copy 0.3.3.5-rc changelog to master.

7 years agoRemove changes files that will appear in 0.3.3.5-rc.
Nick Mathewson [Sat, 14 Apr 2018 16:22:41 +0000 (12:22 -0400)] 
Remove changes files that will appear in 0.3.3.5-rc.

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Sat, 14 Apr 2018 16:21:44 +0000 (12:21 -0400)] 
Merge branch 'maint-0.3.3'

7 years agobump to 0.3.3.5-rc
Nick Mathewson [Sat, 14 Apr 2018 16:21:36 +0000 (12:21 -0400)] 
bump to 0.3.3.5-rc

7 years ago32-bit compilation warnings
Nick Mathewson [Fri, 13 Apr 2018 21:00:51 +0000 (17:00 -0400)] 
32-bit compilation warnings

7 years agotoken_bucket: Fix indentation
David Goulet [Fri, 13 Apr 2018 20:58:49 +0000 (16:58 -0400)] 
token_bucket: Fix indentation

Both header and code file had some indentation issues after mass renaming.

No code behavior change.

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoMerge branch 'token_bucket_once_again_squashed'
Nick Mathewson [Fri, 13 Apr 2018 20:31:58 +0000 (16:31 -0400)] 
Merge branch 'token_bucket_once_again_squashed'

7 years agoFix "make check-spaces"
Nick Mathewson [Fri, 13 Apr 2018 16:04:54 +0000 (12:04 -0400)] 
Fix "make check-spaces"

7 years agoRefactor "timestamp" not to be its own type coupled to token buffers
Nick Mathewson [Fri, 13 Apr 2018 16:03:29 +0000 (12:03 -0400)] 
Refactor "timestamp" not to be its own type coupled to token buffers

Really, the uint32_t is only an optimization; any kind of unit
should work fine.  Some users might want to use time_t or
monotime_coarse_t or something like that.

7 years agoMove token_bucket_raw_* functions to the start of the module.
Nick Mathewson [Fri, 13 Apr 2018 15:42:54 +0000 (11:42 -0400)] 
Move token_bucket_raw_* functions to the start of the module.

(These functions were previously helper functions for
token_bucket_rw_t).

7 years agoNever pick a rate of 0.
Nick Mathewson [Fri, 13 Apr 2018 15:38:57 +0000 (11:38 -0400)] 
Never pick a rate of 0.

(The tests caught this one.)

7 years agoStart re-refactoring the token bucket interface.
Nick Mathewson [Fri, 13 Apr 2018 15:30:53 +0000 (11:30 -0400)] 
Start re-refactoring the token bucket interface.

Begin by creating a lowest-level triple of the types needed to
implement a token bucket: a configuration, a timestamp, and the raw
bucket itself.

Note that for low-level buckets, the units of the timestamp and the
bucket itself are unspecified: each user can use a different type.

(This patch breaks check-spaces; a later patch will fix it)

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Fri, 13 Apr 2018 17:09:15 +0000 (13:09 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge remote-tracking branch 'dgoulet/ticket25248_033_02' into maint-0.3.3
Nick Mathewson [Fri, 13 Apr 2018 17:09:11 +0000 (13:09 -0400)] 
Merge remote-tracking branch 'dgoulet/ticket25248_033_02' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Fri, 13 Apr 2018 17:05:53 +0000 (13:05 -0400)] 
Merge branch 'maint-0.3.3'

7 years agodoc: Fix typo and clarify that DoS options are relay only
Mike Perry [Wed, 11 Apr 2018 02:47:00 +0000 (02:47 +0000)] 
doc: Fix typo and clarify that DoS options are relay only

7 years agodoc: Move DOS options below SERVER options
David Goulet [Thu, 12 Apr 2018 14:40:03 +0000 (10:40 -0400)] 
doc: Move DOS options below SERVER options

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agodoc: Improve DoS section of the man page tor.1
David Goulet [Wed, 4 Apr 2018 14:22:13 +0000 (10:22 -0400)] 
doc: Improve DoS section of the man page tor.1

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>
7 years agoMerge branch 'postloop_callbacks_2'
Nick Mathewson [Fri, 13 Apr 2018 16:12:46 +0000 (12:12 -0400)] 
Merge branch 'postloop_callbacks_2'

7 years agoRemove tell_event_loop_to_run_external_code() per review
Nick Mathewson [Fri, 13 Apr 2018 16:11:22 +0000 (12:11 -0400)] 
Remove tell_event_loop_to_run_external_code() per review

(This function is no longer used.)

7 years agoRename token_bucket_t to token_bucket_rw_t.
Nick Mathewson [Fri, 13 Apr 2018 14:51:59 +0000 (10:51 -0400)] 
Rename token_bucket_t to token_bucket_rw_t.

This is a simple search-and-replace to rename the token bucket type
to indicate that it contains both a read and a write bucket, bundled
with their configuration.  It's preliminary to refactoring the
bucket type.

7 years agoMerge branch 'token_bucket_refactor_squashed'
Nick Mathewson [Fri, 13 Apr 2018 14:47:24 +0000 (10:47 -0400)] 
Merge branch 'token_bucket_refactor_squashed'

7 years agoChanges files for post-loop events (25374)
Nick Mathewson [Mon, 2 Apr 2018 20:48:54 +0000 (16:48 -0400)] 
Changes files for post-loop events (25374)

7 years agoAdd a unit test for post-loop events
Nick Mathewson [Mon, 2 Apr 2018 20:47:28 +0000 (16:47 -0400)] 
Add a unit test for post-loop events

This test works by having two post-loop events activate one another
in a tight loop.  If the "post-loop" mechanism didn't work, this
would be enough to starve all other events.

7 years agoMove connection_ap_attach_pending(0) into a postloop event
Nick Mathewson [Mon, 2 Apr 2018 19:20:21 +0000 (15:20 -0400)] 
Move connection_ap_attach_pending(0) into a postloop event

This is a second motivating case for our postloop event logic.

7 years agoMove the "activate linked connections" logic to a postloop event.
Nick Mathewson [Mon, 2 Apr 2018 19:08:41 +0000 (15:08 -0400)] 
Move the "activate linked connections" logic to a postloop event.

A linked connection_t is one that gets its I/O, not from the
network, but from another connection_t.  When such a connection has
something to write, we want the corresponding connection to run its
read callback ... but not immediately, to avoid infinite recursion
and/or event loop starvation.

Previously we handled this case by activating the read events
outside the event loop.  Now we use the "postloop event" logic.
This lets us simplify do_main_loop_once() a little.

7 years agoGeneric mechaism for "post-loop" callbacks
Nick Mathewson [Mon, 2 Apr 2018 19:02:53 +0000 (15:02 -0400)] 
Generic mechaism for "post-loop" callbacks

We've been labeling some events as happening "outside the event
loop", to avoid Libevent starvation.  This patch provides a cleaner
mechanism to avoid that starvation.

For background, the problem here is that Libevent only scans for new
events once it has run all its active callbacks.  So if the
callbacks keep activating new callbacks, they could potentially
starve Libevent indefinitely and keep it from ever checking for
timed, socket, or signal events.

To solve this, we add the ability to label some events as
"post-loop".  The rule for a "post-loop" event is that any events
_it_ activates can only be run after libevent has re-scanned for new
events at least once.

7 years agoDisable load_geoip_file() tests on windows
Nick Mathewson [Thu, 12 Apr 2018 16:45:12 +0000 (12:45 -0400)] 
Disable load_geoip_file() tests on windows

See bug #25787 for discussion; we should have a better fix here.

7 years agoIncrease tolerances for imprecise time.
Nick Mathewson [Fri, 13 Apr 2018 14:37:06 +0000 (10:37 -0400)] 
Increase tolerances for imprecise time.

7 years agoAccept small hops backward in the monotonic timer.
Nick Mathewson [Thu, 12 Apr 2018 17:11:35 +0000 (13:11 -0400)] 
Accept small hops backward in the monotonic timer.

7 years agochanges file for token_bucket refactoring
Nick Mathewson [Tue, 10 Apr 2018 18:01:30 +0000 (14:01 -0400)] 
changes file for token_bucket refactoring

7 years agoRemove a bunch of int casts; make clang happier.
Nick Mathewson [Tue, 10 Apr 2018 17:56:45 +0000 (13:56 -0400)] 
Remove a bunch of int casts; make clang happier.

7 years agoEnsure that global buckets are updated on configuration change
Nick Mathewson [Tue, 10 Apr 2018 17:40:34 +0000 (13:40 -0400)] 
Ensure that global buckets are updated on configuration change

7 years agoReplace the global buckets with token_bucket_t
Nick Mathewson [Tue, 10 Apr 2018 17:19:25 +0000 (13:19 -0400)] 
Replace the global buckets with token_bucket_t

7 years agoRefactor or_connection token buckets to use token_bucket_t
Nick Mathewson [Tue, 10 Apr 2018 16:34:28 +0000 (12:34 -0400)] 
Refactor or_connection token buckets to use token_bucket_t

7 years agoAdd a helper function to decrement read and write at the same time
Nick Mathewson [Tue, 10 Apr 2018 16:33:30 +0000 (12:33 -0400)] 
Add a helper function to decrement read and write at the same time

7 years agoAdd a new token-bucket backend abstraction, with tests
Nick Mathewson [Tue, 10 Apr 2018 15:23:14 +0000 (11:23 -0400)] 
Add a new token-bucket backend abstraction, with tests

This differs from our previous token bucket abstraction in a few
ways:

  1) It is an abstraction, and not a collection of fields.
  2) It is meant to be used with monotonic timestamps, which should
     produce better results than calling gettimeofday over and over.

7 years agoExpose a function that computes stamp units from msec.
Nick Mathewson [Tue, 10 Apr 2018 14:47:11 +0000 (10:47 -0400)] 
Expose a function that computes stamp units from msec.

(It turns out we can't just expose STAMP_TICKS_PER_SECOND, since
Apple doesn't have that.)

7 years agoRefine extend_info_for_node's "enough info" check once again.
Nick Mathewson [Thu, 12 Apr 2018 20:53:53 +0000 (16:53 -0400)] 
Refine extend_info_for_node's "enough info" check once again.

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

7 years agoRemove windows log_from_handle as unused.
Nick Mathewson [Thu, 12 Apr 2018 16:38:46 +0000 (12:38 -0400)] 
Remove windows log_from_handle as unused.

This function was only used by PortForwardingHelper, which was
removed in 9df110cd72.  Its presence caused warnings on windows.

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Thu, 12 Apr 2018 16:31:41 +0000 (12:31 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoAttempt to fix 32-bit clang builds, which broke with 31508a0abccfee1cd
Nick Mathewson [Thu, 12 Apr 2018 16:24:36 +0000 (12:24 -0400)] 
Attempt to fix 32-bit clang builds, which broke with 31508a0abccfee1cd

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.

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Thu, 12 Apr 2018 16:25:51 +0000 (12:25 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoAttempt to fix 32-bit builds, which broke with 31508a0abccfee1cd
Nick Mathewson [Thu, 12 Apr 2018 16:24:36 +0000 (12:24 -0400)] 
Attempt to fix 32-bit builds, which broke with 31508a0abccfee1cd

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.

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Thu, 12 Apr 2018 15:14:42 +0000 (11:14 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoUse less memory for MaxMemInQueues for machines with more than 8 GB of RAM.
Alexander Færøy [Tue, 3 Apr 2018 16:26:52 +0000 (18:26 +0200)] 
Use less memory for MaxMemInQueues for machines with more than 8 GB of RAM.

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

7 years agoUse STATIC for compute_real_max_mem_in_queues
Alexander Færøy [Tue, 3 Apr 2018 15:44:42 +0000 (17:44 +0200)] 
Use STATIC for compute_real_max_mem_in_queues

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

7 years agoMake get_total_system_memory mockable.
Alexander Færøy [Tue, 3 Apr 2018 15:43:17 +0000 (17:43 +0200)] 
Make get_total_system_memory mockable.

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

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Wed, 11 Apr 2018 19:38:00 +0000 (15:38 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge branch 'bug25581_033_v2_asn_squashed' into maint-0.3.3
Nick Mathewson [Wed, 11 Apr 2018 19:37:56 +0000 (15:37 -0400)] 
Merge branch 'bug25581_033_v2_asn_squashed' into maint-0.3.3

7 years agoRename HSLayer{2,3}Nodes to start without an underscore.
Nick Mathewson [Mon, 26 Mar 2018 13:25:38 +0000 (09:25 -0400)] 
Rename HSLayer{2,3}Nodes to start without an underscore.

The old single-underscore names remain as a deprecated synonym.

Fixes bug 25581; bugfix on 0.3.3.1-alpha.

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Wed, 11 Apr 2018 14:48:46 +0000 (10:48 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoBug 24989: Count client hsdir gets towards MaxClientCircuitsPending.
Mike Perry [Wed, 24 Jan 2018 00:03:24 +0000 (00:03 +0000)] 
Bug 24989: Count client hsdir gets towards MaxClientCircuitsPending.

We removed this by breaking them out from general in #13837.

7 years agoMerge remote-tracking branch 'isis-github/bug25425_squashed2'
Nick Mathewson [Tue, 10 Apr 2018 19:32:26 +0000 (15:32 -0400)] 
Merge remote-tracking branch 'isis-github/bug25425_squashed2'

7 years agoMerge remote-tracking branch 'isis-github/bug25409'
Nick Mathewson [Tue, 10 Apr 2018 19:27:09 +0000 (15:27 -0400)] 
Merge remote-tracking branch 'isis-github/bug25409'

7 years agochanges: Add changes file for 25425.
Isis Lovecruft [Tue, 10 Apr 2018 19:26:46 +0000 (19:26 +0000)] 
changes: Add changes file for 25425.

7 years agochanges: Add changes file for 25409.
Isis Lovecruft [Tue, 10 Apr 2018 19:21:10 +0000 (19:21 +0000)] 
changes: Add changes file for 25409.

7 years agoconfig: Obsolete PortForwarding and PortForwardingHelper options.
Isis Lovecruft [Tue, 10 Apr 2018 19:08:57 +0000 (19:08 +0000)] 
config: Obsolete PortForwarding and PortForwardingHelper options.

 * FIXES part of #25409: https://bugs.torproject.org/25409

7 years agoMerge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Tue, 10 Apr 2018 18:26:32 +0000 (14:26 -0400)] 
Merge branch 'maint-0.3.1' into maint-0.3.2

7 years agoMerge branch 'maint-0.3.2' into maint-0.3.3
Nick Mathewson [Tue, 10 Apr 2018 18:26:32 +0000 (14:26 -0400)] 
Merge branch 'maint-0.3.2' into maint-0.3.3

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Tue, 10 Apr 2018 18:26:32 +0000 (14:26 -0400)] 
Merge branch 'maint-0.3.3'

7 years agoMerge branch 'maint-0.2.9' into maint-0.3.1
Nick Mathewson [Tue, 10 Apr 2018 18:26:29 +0000 (14:26 -0400)] 
Merge branch 'maint-0.2.9' into maint-0.3.1

7 years agoMerge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9
Nick Mathewson [Tue, 10 Apr 2018 18:25:57 +0000 (14:25 -0400)] 
Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9

7 years agoRemove TestingEnableTbEmptyEvent
Nick Mathewson [Tue, 10 Apr 2018 16:16:21 +0000 (12:16 -0400)] 
Remove TestingEnableTbEmptyEvent

This option was used for shadow testing previously, but is no longer
used for anything.  It interferes with refactoring our token buckets.

7 years agotests: Make tt_finished() macro for tests without tt_*_op() calls.
Isis Lovecruft [Thu, 29 Mar 2018 23:27:42 +0000 (23:27 +0000)] 
tests: Make tt_finished() macro for tests without tt_*_op() calls.

7 years agotest: Add testing module and some unittests for bridges.c.
Isis Lovecruft [Mon, 5 Mar 2018 20:43:26 +0000 (20:43 +0000)] 
test: Add testing module and some unittests for bridges.c.

This roughly doubles our test coverage of the bridges.c module.

 * ADD new testing module, .../src/test/test_bridges.c.
 * CHANGE a few function declarations from `static` to `STATIC`.
 * CHANGE one function in transports.c, transport_get_by_name(), to be
   mockable.
 * CLOSES #25425: https://bugs.torproject.org/25425

7 years agoPrefer 32-bit implementation for timing wheels on 32-bit systems.
Nick Mathewson [Mon, 9 Apr 2018 19:21:10 +0000 (15:21 -0400)] 
Prefer 32-bit implementation for timing wheels on 32-bit systems.

This might make our timing-wheel code a tiny bit faster there.

Closes ticket 24688.

7 years agocompat: Fix unchecked return value from event_del()
David Goulet [Mon, 9 Apr 2018 18:09:40 +0000 (14:09 -0400)] 
compat: Fix unchecked return value from event_del()

Explicitly tell the compiler we don't care about it.

Coverity CID 1434156

Signed-off-by: David Goulet <dgoulet@torproject.org>
7 years agoAdd a comment explaining why we do a certain redundant check
Nick Mathewson [Mon, 9 Apr 2018 16:58:17 +0000 (12:58 -0400)] 
Add a comment explaining why we do a certain redundant check

Closes ticket 25291.

7 years agoLift the list of default directory servers into their own file.
Alexander Færøy [Fri, 6 Apr 2018 01:58:16 +0000 (03:58 +0200)] 
Lift the list of default directory servers into their own file.

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

7 years agoInclude tor_log rust files in source distribution.
Nick Mathewson [Fri, 6 Apr 2018 20:19:14 +0000 (16:19 -0400)] 
Include tor_log rust files in source distribution.

Fixes another case of #25732; bug not in any released Tor.

7 years agoMerge branch 'maint-0.3.3'
Nick Mathewson [Fri, 6 Apr 2018 20:18:47 +0000 (16:18 -0400)] 
Merge branch 'maint-0.3.3'