c68bfc556c
Merge branch 'maint-0.3.3'
2018-03-26 10:29:29 -04:00
33606405e3
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-26 10:29:29 -04:00
b5a6c03998
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-26 10:29:29 -04:00
068d092749
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-26 10:29:29 -04:00
e263317e07
Merge remote-tracking branch 'fristonio/ticket-24740'
2018-03-23 11:22:58 -04:00
11114c7e83
Merge branch 'maint-0.3.3'
2018-03-23 11:19:19 -04:00
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
24abcf9771
Merge branch 'bug25399_squashed'
2018-03-22 08:49:43 -04:00
608aa62ec9
make changes file pass lintchanges
2018-03-22 08:49:08 -04:00
946ed24ca5
Do not page-align mmap length. #25399
2018-03-22 08:47:37 -04:00
2c36a02bb1
Merge branch 'maint-0.3.3'
2018-03-20 12:55:46 -04:00
b069979142
Merge branch 'bug25306_032_01_squashed_v2' into maint-0.3.3
2018-03-20 12:54:51 -04:00
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
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
56ae6d8766
Merge branch 'maint-0.3.3'
2018-03-20 07:50:46 -04:00
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
a08e18545a
Remove changes files already merged into 0.3.3
2018-03-20 07:26:07 -04:00
bc5f79b95c
Use tor_asprintf for in have_enough_mem_for_dircache()
...
(Fixes bug 20887)
2018-03-19 12:38:28 -04:00
b0f0c0f550
Merge remote-tracking branch 'fristonio/ticket-6236'
2018-03-19 06:42:10 -04:00
a324cd9020
Merge branch 'ticket25268_034_01'
2018-03-19 06:01:02 -04:00
4449c9e8fe
add a changes file for 25268
2018-03-19 06:00:00 -04:00
92c60b572c
Merge branch 'maint-0.3.3'
2018-03-19 05:39:56 -04:00
9d1c7c3a8a
changes: Add changes file for bug25479.
2018-03-19 05:38:26 -04:00
bcea98a4b4
Merge branch 'maint-0.3.3'
2018-03-19 05:36:06 -04:00
296e429ebc
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-19 05:36:06 -04:00
a0cc7e9492
Merge remote-tracking branch 'isis/bug25450_032' into maint-0.3.2
2018-03-19 05:35:39 -04:00
03f748d0ca
Merge branch 'maint-0.3.3'
2018-03-13 11:03:08 -04:00
f0f2fab5e1
Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3
2018-03-13 11:02:34 -04:00
c6d364e8ae
Merge branch 'maint-0.3.3'
2018-03-13 10:59:56 -04:00
d60dc27555
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-13 10:59:30 -04:00
950606dcc9
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-13 10:58:03 -04:00
38b7885c90
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-13 10:58:03 -04:00
0e7f15fdb6
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-13 10:58:02 -04:00
67a313f0ec
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-03-13 10:58:02 -04:00
3418a3a7f0
Update geoip and geoip6 to the March 8 2018 database.
2018-03-13 10:57:49 -04:00
1047ef140e
Merge branch 'maint-0.3.3'
2018-03-13 13:41:33 +01:00
676a28599d
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-13 13:41:24 +01:00
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
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
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
930b985581
Fix redundant authority certificate fetch
...
- Fixes #24740
- Fetch certificates only in those cases when consensus are waiting for certs.
2018-03-04 21:13:58 +05:30
699bb803ba
Fix a crash bug when testing reachability
...
Fixes bug 25415; bugfix on 0.3.3.2-alpha.
2018-03-04 10:31:17 -05:00
e5a990fc5a
tweak changelog for 4187
2018-03-03 12:02:45 -05:00
df9d2de441
Merge remote-tracking branch 'fristonio/ticket4187'
2018-03-03 12:02:30 -05:00
338dbdab93
Merge branch 'maint-0.3.3'
2018-03-03 11:59:27 -05:00
ccf0f77da1
changes file for 25378
2018-03-03 11:58:22 -05:00
62482ea279
Merge branch 'maint-0.3.3'
2018-03-03 11:53:05 -05:00
cc7de9ce1d
Merge branch 'ticket23814' into maint-0.3.3
2018-03-03 11:53:01 -05:00
d22963938f
Merge branch 'maint-0.3.3'
2018-03-01 16:10:47 -05:00
f7eff2f8c5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-01 16:10:43 -05:00
Nick Mathewson
Isis Lovecruft
Alex Xu (Hello71)
David Goulet
Alexander Færøy
Neel Chauhan
Karsten Loesing
Deepesh Pathak