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
28,307 Commits 53 Branches 631 Tags
1268baee9e182afd764bc0e2bb68e205349f4376
Commit Graph

20953 Commits

Author SHA1 Message Date
Mike Perry 1268baee9e Bug 25903: Report new CIRC_BW fields to control port. 2018-05-09 21:23:11 +00:00
Mike Perry e07e95edd3 Bug 25903: Perform accounting for new CIRC_BW fields. 
Two new values in each direction. DELIVERED counts valid end-to-end circuit
data that is accepted by our end and OVERHEAD counts the slack unused data in
each of the relay command cells for those accepted cells.

Control port changes are in the next commit.
 2018-05-09 21:23:06 +00:00
David Goulet 7b09282dc7 Merge remote-tracking branch 'dgoulet/ticket25515_034_01-squashed' 2018-04-26 11:38:15 -04:00
juga0 f4ad30448a Recover newline at the EOF, removed by mistake 
in 071236e3e2.
 2018-04-26 11:33:22 -04:00
juga0 3d4bbf94c6 tests: Add forgotten empty file required for geoip 2018-04-26 11:33:22 -04:00
juga0 d0ad74e0f6 Add clarification about type of file expected 2018-04-26 11:33:22 -04:00
juga0 96469b82f8 Remove FIXME about comparing num countries, 
* remove the fixme since clearing the countries should be other issue
* remove unused variables related to it since that cause travis to fail
 2018-04-26 11:33:22 -04:00
Isis Lovecruft 6a28a82998 tests: Fix a couple typos and remove unnecessary inline comments. 2018-04-26 11:33:22 -04:00
Isis Lovecruft 3f967bfbd1 tests: Skip two more geoip_load_file tests on Windows. 
* FIXES part of #25515: https://bugs.torproject.org/25515
 2018-04-26 11:33:22 -04:00
Nick Mathewson 33cba1195b Remove a blank line that was bothering me. 2018-04-26 09:10:58 -04:00
Nick Mathewson 2748dd0f1c Ignore CircuitPriorityHalflife values under -EPSILON. 
Previously, we were ignoring values _over_ EPSILON.  This bug was
also causing a warning at startup because the default value is set
to -1.0.

Fixes bug 25577; bugfix on 6b1dba214d.  Bug not in any released tor.
 2018-04-25 09:15:47 -04:00
Nick Mathewson a052eea480 Merge branch 'maint-0.3.3' 2018-04-25 08:01:54 -04:00
Nick Mathewson 58f54a3588 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-04-25 08:01:54 -04:00
Nick Mathewson 7c3f87eb4b Merge branch 'maint-0.3.1' into maint-0.3.2 2018-04-25 08:01:53 -04:00
Nick Mathewson bb35405d2a Fix a copy-paste error in the fix for #23693. 
Found by coverity; CID 25912; bug not in any released Tor.
 2018-04-25 08:00:55 -04:00
Nick Mathewson ea3c3a10a2 Merge branch 'maint-0.3.3' 2018-04-24 10:37:36 -04:00
Nick Mathewson 7e7b052b2a Merge branch 'maint-0.3.2' into maint-0.3.3 2018-04-24 10:37:36 -04:00
Nick Mathewson 9187cdb1cd Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2 2018-04-24 10:36:17 -04:00
Nick Mathewson 9be7608fda Merge branch 'maint-0.3.3' 2018-04-24 08:51:58 -04:00
Nick Mathewson 6182f60f75 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-04-24 08:51:55 -04:00
Nick Mathewson d2951b381b Merge branch 'maint-0.3.1' into maint-0.3.2 2018-04-24 08:49:24 -04:00
Nick Mathewson e888634076 Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1 2018-04-24 08:49:20 -04:00
David Goulet b259008c56 hs: Fix memleak in v3 on SIGHUP 
Fixes #25901

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-04-23 11:09:57 -04:00
Nick Mathewson 192c7c8bf9 Merge remote-tracking branch 'dgoulet/ticket25762_034_05' 2018-04-23 11:02:05 -04:00
David Goulet 665e23c59a test: Add periodic events unit tests 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-04-23 10:57:28 -04:00
David Goulet 87cb9ce900 main: Update periodic events comment based on latest code 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-04-23 10:57:28 -04:00
Nick Mathewson f70fa67da6 main: Use rescan_periodic_events in initialize_periodic_events_cb 2018-04-23 10:57:28 -04:00
David Goulet 4e85f17eec periodic: Add an enable and disable function 
Two helper functions to enable an event and disable an event which wraps the
launch and destroy of an event but takes care of the enabled flag.

They are also idempotent that is can be called multiple time on the same event
without effect if the event was already enabled or disabled.

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-04-23 10:57:28 -04:00
David Goulet 1d864987cb config: Set up periodic events when options changes 
In case we transitionned to a new role in Tor, we need to launch and/or
destroy some periodic events.

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-04-23 10:57:28 -04:00
David Goulet a4fcdc5dec main: Launch periodic events by roles 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-04-23 10:57:28 -04:00
David Goulet ed89bb3253 main: Specialize the periodic events on a per-role basis 
In tor, we have a series of possible "roles" that the tor daemon can be
enabled for. They are:

  Client, Bridge, Relay, Authority (directory or bridge) and Onion service.

They can be combined sometimes. For instance, a Directory Authority is also a
Relay. This adds a "roles" field to a periodic event item object which is used
to know for which roles the event is for.

The next step is to enable the event only if the roles apply. No behavior
change at this commit.

Pars of #25762

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-04-23 10:21:59 -04:00
David Goulet 269cd5dba7 main: Sort alphabetically periodic event callbacks 
No behavior change, just to make it easier to find callbacks and for the sake
of our human brain to parse the list properly.

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-04-23 10:21:59 -04:00
Nick Mathewson 3527f4b8a4 Merge remote-tracking branch 'github/lazy_bucket_refill' 2018-04-23 09:47:05 -04:00
Nick Mathewson e8683bcbb1 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-04-23 09:24:33 -04:00
Nick Mathewson 1438c6c713 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-04-23 09:23:31 -04:00
Nick Mathewson 5c3639923f Merge branch 'maint-0.2.9' into maint-0.3.1 2018-04-23 09:23:31 -04:00
Nick Mathewson c5ffcbb43f Merge branch 'maint-0.3.3' 2018-04-23 09:23:31 -04:00
Nick Mathewson beb321d8cd Merge branch 'maint-0.3.2' into maint-0.3.3 2018-04-23 09:23:31 -04:00
Nick Mathewson c4be6dfeab Permit the nanosleep system call in the seccomp2 callbox 
Fixes bug 24969; bugfix on 0.2.5.1-alpha when the sandbox was introduced.
 2018-04-23 09:15:40 -04:00
Nick Mathewson cd3fc2aa48 Merge remote-tracking branch 'neel/b25511-r4' 2018-04-23 09:13:24 -04:00
Nick Mathewson 915791bc48 Merge branch 'ticket25024_squashed' 2018-04-22 20:53:04 -04:00
Deepesh Pathak 72bfcb37f1 add changes file and update check-typos in makefile 2018-04-22 20:48:48 -04:00
Nick Mathewson 1ba9b7e013 Merge remote-tracking branch 'mikeperry/bug25400_squashed' 2018-04-22 20:39:35 -04:00
Nick Mathewson 0e8ae82a87 Merge branch 'remove_old_consensus_methods_2018_squashed' 2018-04-22 20:01:09 -04:00
Nick Mathewson 2609a8be81 Require MIN_METHOD_FOR_RECOMMENDED_PROTOCOLS 
(Remove support for running without this method.)
 2018-04-22 20:00:47 -04:00
Nick Mathewson 5f90d28c01 Remove MIN_METHOD_FOR_{SHARED_RANDOM,EXCLUDING_INVALID_NODES} 
Also remove client detection for pre-EXCLUDING_INVALID_NODES
consensuses, and a test for that detection.
 2018-04-22 20:00:47 -04:00
Nick Mathewson 73c9c16faa Remove MIN_METHOD_FOR_ED25519_ID_VOTING 
This also lets us remove the old rsa-based routerstatus collator.
 2018-04-22 20:00:47 -04:00
Nick Mathewson 4d6f21bb6b Remove MIN_METHOD_FOR_{PACKAGE_LINES,GUARDFRACTION,ED25519_ID_IN_MD} 
Also remove a rest for pre-19 microdesc versions.
 2018-04-22 20:00:47 -04:00
Nick Mathewson caf766991d Remove MIN_METHOD_FOR_ID_HASH_IN_MD and a test for running without it. 2018-04-22 20:00:47 -04:00
Nick Mathewson 93380db833 Remove MIN_METHOD_{FOR_P6_LINES,FOR_NTOR_KEY,TO_CLIP_UNMEASURED_BW} 
Also remove a unit test for pre-MIN_METHOD_FOR_NTOR_KEY consensuses.
 2018-04-22 20:00:47 -04:00