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,803 Commits 53 Branches 631 Tags
ca2d9cbb937e70e3f69e88e4e6a00fc0f818340c
Commit Graph

27803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson ca2d9cbb93 Merge branch 'bug24903_029' into maint-0.3.3 2018-03-26 10:32:49 -04:00
Nick Mathewson 33606405e3 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-03-26 10:29:29 -04:00
Nick Mathewson b5a6c03998 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-03-26 10:29:29 -04:00
Nick Mathewson 068d092749 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-03-26 10:29:29 -04:00
Nick Mathewson 33a80921a2 When extending a circuit's path length, clear onehop_tunnel. 
There was a nonfatal assertion in pathbias_should_count that would
trigger if onehop_tunnel was set, but the desired_path_length was
greater than 1.  This patch fixes that.  Fixes bug 24903; bugfix on
0.2.5.2-alpha.
 2018-03-26 09:17:50 -04:00
Nick Mathewson eacfd29112 Fix windows compilation warnings in hs_service.c 
These were breaking jenkins builds.  Bugfix on 5804ccc9070dc54;
bug not in any released Tor.
 2018-03-23 17:47:56 -04:00
Nick Mathewson 79d3f401a5 Merge branch 'bug25560_rebased_033' into maint-0.3.3 2018-03-23 11:18:20 -04:00
Isis Lovecruft 657d5cbbbc tests: Automatically detect Rust crates to test and also pass --verbose. 
* FIXES #25560: https://bugs.torproject.org/25560.
 2018-03-23 11:13:04 -04:00
Nick Mathewson 2b31387410 Update src/ext/rust to latest master for libc update. 2018-03-21 17:09:59 -04:00
Nick Mathewson 95b78d4178 Merge branch 'bug25310_r1_033' into maint-0.3.3 2018-03-21 17:04:38 -04:00
Isis Lovecruft 00a473733d maint: Update Rust libc dependency from 0.2.22 to 0.2.39. 
Requires the update/libc-0.2.39 branch from
https://github.com/isislovecruft/tor-rust-dependencies to be merged
first.
 2018-03-21 17:04:28 -04:00
Isis Lovecruft 9799394375 maint: Add script for vendoring/updating Rust dependencies. 
* ADD documentation for usage both inside the script and in
   doc/HACKING/CodingStandardsRust.md
 * FIXES part of #25310: https://bugs.torproject.org/25310
 2018-03-21 17:04:28 -04:00
Isis Lovecruft f9ccb2543d doc: Document our current rough-draft policy on Rust dependencies. 
* FIXES #25310: https://bugs.torproject.org/25310
 2018-03-21 17:04:04 -04:00
Nick Mathewson b069979142 Merge branch 'bug25306_032_01_squashed_v2' into maint-0.3.3 2018-03-20 12:54:51 -04:00
David Goulet 5804ccc907 hs-v3: BUG() on missing descriptors during rotation 
Because of #25306 for which we are unable to reproduce nor understand how it
is possible, this commit removes the asserts() and BUG() on the missing
descriptors instead when rotating them.

This allows us to log more data on error but also to let tor recover
gracefully instead of dying.

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2018-03-20 12:54:05 -04:00
Nick Mathewson 9f93bcd16d Remove sb_poll check: all poll() calls are ok. 2018-03-20 08:30:21 -04:00
Nick Mathewson 070eda5a21 Add the poll() syscall as permitted by the sandbox 
Apparently, sometimes getpwnam will call this.

Fixes bug 25513.
 2018-03-20 08:23:44 -04:00
Nick Mathewson 74c767af29 Note that we require latest stable rust. 2018-03-20 07:58:29 -04:00
Alexander Færøy fd36bd8971 Log information on specific compression backends in the OOM handler. 
This patch adds some additional logging to circuits_handle_oom() to give
us more information about which specific compression backend that is
using a certain amount of memory.

See: https://bugs.torproject.org/25372
 2018-03-20 07:47:19 -04:00
Nick Mathewson 910422e8fa Merge branch 'maint-0.3.2' into maint-0.3.3 2018-03-19 16:59:49 -04:00
Isis Lovecruft 66d3120634 tests: Fix HS test against max IP lifetime. 
* FIXES part of #25450: https://bugs.torproject.org/25450
 2018-03-19 16:59:07 -04:00
Nick Mathewson 1aa0ae2cc3 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-03-19 05:42:43 -04:00
Nick Mathewson 3370b3cfef Merge branch 'maint-0.2.5' into maint-0.2.9 2018-03-19 05:42:43 -04:00
Nick Mathewson 85719b79b7 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-03-19 05:42:43 -04:00
Nick Mathewson bc0de600b2 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-03-19 05:42:43 -04:00
Nick Mathewson 0eb2cdf99d Merge remote-tracking branch 'catalyst-github/bug25388-025' into maint-0.2.5 2018-03-19 05:42:38 -04:00
Isis Lovecruft 9d1c7c3a8a changes: Add changes file for bug25479. 2018-03-19 05:38:26 -04:00
Gisle Vanem 53914f7dae tests: Fix crash on win32 due to uninitialised mutex in bench.c. 
Signed-off-by: Isis Lovecruft <isis@torproject.org>
 2018-03-19 05:38:19 -04:00
Nick Mathewson 296e429ebc Merge branch 'maint-0.3.2' into maint-0.3.3 2018-03-19 05:36:06 -04:00
Nick Mathewson a0cc7e9492 Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2 2018-03-19 05:35:39 -04:00
Nick Mathewson f0f2fab5e1 Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3 2018-03-13 11:02:34 -04:00
Nick Mathewson d60dc27555 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-03-13 10:59:30 -04:00
Nick Mathewson 6bc324c96a Merge branch 'maint-0.3.2' into maint-0.3.3 2018-03-13 10:59:30 -04:00
Nick Mathewson 950606dcc9 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-03-13 10:58:03 -04:00
Nick Mathewson 38b7885c90 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-03-13 10:58:03 -04:00
Nick Mathewson 0e7f15fdb6 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-03-13 10:58:02 -04:00
Nick Mathewson 67a313f0ec Merge branch 'maint-0.2.5' into maint-0.2.9 2018-03-13 10:58:02 -04:00
Karsten Loesing 3418a3a7f0 Update geoip and geoip6 to the March 8 2018 database. 2018-03-13 10:57:49 -04:00
Nick Mathewson 676a28599d Merge branch 'maint-0.3.2' into maint-0.3.3 2018-03-13 13:41:24 +01:00
Nick Mathewson 094294dbb1 Merge branch 'bug25474_032' into maint-0.3.2 2018-03-13 13:41:11 +01:00
Nick Mathewson 53a807e1e9 Add a missing prototype to our libevent configure stanza. 
Fixes bug 25474; bugfix on 0.3.2.5-alpha.
 2018-03-13 13:37:26 +01:00
Nick Mathewson e9dbd6dd8f Update the documentation in tor_api.h 2018-03-13 10:00:41 +01:00
Isis Lovecruft 9191d962f9 changes: Fix changes file for bug25450. 
It didn't like me insulting my patch, I guess.
 2018-03-08 20:50:57 +00:00
Isis Lovecruft 0545f64d24 test: Increase time limit for IP creation in an HS test. 
This should avoid most intermittent test failures on developer and CI machines,
but there could (and probably should) be a more elegant solution.

Also, this test was testing that the IP was created and its expiration time was
set to a time greater than or equal to `now+INTRO_POINT_LIFETIME_MIN_SECONDS+5`:

    /* Time to expire MUST also be in that range. We add 5 seconds because
     * there could be a gap between setting now and the time taken in
     * service_intro_point_new. On ARM, it can be surprisingly slow... */
    tt_u64_op(ip->time_to_expire, OP_GE,
              now + INTRO_POINT_LIFETIME_MIN_SECONDS + 5);

However, this appears to be a typo, since, according to the comment above it,
adding five seconds was done because the IP creation can be slow on some
systems.  But the five seconds is added to the *minimum* time we're comparing
against, and so it actually functions to make this test *more* likely to fail on
slower systems.  (It should either subtract five seconds, or instead add it to
time_to_expire.)

 * FIXES #25450: https://bugs.torproject.org/25450
 2018-03-08 20:50:50 +00:00
Fernando Fernandez Mancera c1cfa0fbc4 Tweaks into AccountingStart documentation. 
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
 2018-03-08 12:28:34 +01:00
Nick Mathewson ccf0f77da1 changes file for 25378 2018-03-03 11:58:22 -05:00
Alexander Færøy 59a7b00384 Update tor.1.txt with the currently available log domains. 
See: https://bugs.torproject.org/25378
 2018-03-03 11:58:14 -05:00
Nick Mathewson cc7de9ce1d Merge branch 'ticket23814' into maint-0.3.3 2018-03-03 11:53:01 -05:00
Nick Mathewson aec505a310 bump to 0.3.3.3-alpha-dev 2018-03-03 11:33:56 -05:00
Nick Mathewson 35d945a646 Merge branch 'maint-0.3.2' into maint-0.3.3 
"ours" merge to avoid version bump.
 2018-03-03 11:33:33 -05:00