Nick Mathewson
841ed9dbb9
Merge remote-tracking branch 'dgoulet/bug24904_033_01' into maint-0.3.3
2018-03-26 19:47:44 -04:00
Nick Mathewson
5278d72f97
Merge branch 'maint-0.3.3'
2018-03-26 10:32:53 -04:00
Nick Mathewson
ca2d9cbb93
Merge branch 'bug24903_029' into maint-0.3.3
2018-03-26 10:32:49 -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
b5a6c03998
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-26 10:29:29 -04:00
Nick Mathewson
c68bfc556c
Merge branch 'maint-0.3.3'
2018-03-26 10:29:29 -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
d1874b4339
Make extend_info_from_node() more picky about node contents
...
This update is needed to make it consistent with the behavior of
node_awaiting_ipv6(), which doesn't believe in the addresses from
routerinfos unless it actually plans to use those routerinfos.
Fixes bug 25213; bugfix on b66b62fb75
in 0.3.3.1-alpha,
which tightened up the definition of node_awaiting_ipv6().
2018-03-26 09:56:12 -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
George Kadianakis
216bc353d3
fixup! Refactor: suppress duplicated functions from router.c and encapsulate NODE_DESC_BUF_LEN constant.
2018-03-25 20:13:00 +03:00
Nick Mathewson
3519d0c808
Clear all control.c flags on control_free_all()
...
Fixes bug 25512.
2018-03-23 11:31:56 -04:00
Nick Mathewson
e263317e07
Merge remote-tracking branch 'fristonio/ticket-24740'
2018-03-23 11:22:58 -04:00
Nick Mathewson
11114c7e83
Merge branch 'maint-0.3.3'
2018-03-23 11:19:19 -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
David Goulet
236c92a0a7
chan: Use channel_is_client() in channel_do_open_actions()
...
Make sure we actually only report client channel to the geoip cache instead of
looking if it is a known relay. Looking if it is a known relay can be
unreliable because they come and go from the consensus.
Fixes #24904
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-03-23 10:11:37 -04:00
Nick Mathewson
24abcf9771
Merge branch 'bug25399_squashed'
2018-03-22 08:49:43 -04:00
Nick Mathewson
608aa62ec9
make changes file pass lintchanges
2018-03-22 08:49:08 -04:00
Alex Xu (Hello71)
946ed24ca5
Do not page-align mmap length. #25399
2018-03-22 08:47:37 -04:00
Nick Mathewson
2c36a02bb1
Merge branch 'maint-0.3.3'
2018-03-20 12:55:46 -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
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
56ae6d8766
Merge branch 'maint-0.3.3'
2018-03-20 07:50:46 -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
a08e18545a
Remove changes files already merged into 0.3.3
2018-03-20 07:26:07 -04:00
Neel Chauhan
bc5f79b95c
Use tor_asprintf for in have_enough_mem_for_dircache()
...
(Fixes bug 20887)
2018-03-19 12:38:28 -04:00
Nick Mathewson
b0f0c0f550
Merge remote-tracking branch 'fristonio/ticket-6236'
2018-03-19 06:42:10 -04:00
Nick Mathewson
a324cd9020
Merge branch 'ticket25268_034_01'
2018-03-19 06:01:02 -04:00
Nick Mathewson
4449c9e8fe
add a changes file for 25268
2018-03-19 06:00:00 -04:00
Nick Mathewson
92c60b572c
Merge branch 'maint-0.3.3'
2018-03-19 05:39:56 -04:00
Isis Lovecruft
9d1c7c3a8a
changes: Add changes file for bug25479.
2018-03-19 05:38:26 -04:00
Nick Mathewson
bcea98a4b4
Merge branch 'maint-0.3.3'
2018-03-19 05:36:06 -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
03f748d0ca
Merge branch 'maint-0.3.3'
2018-03-13 11:03:08 -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
c6d364e8ae
Merge branch 'maint-0.3.3'
2018-03-13 10:59:56 -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
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
1047ef140e
Merge branch 'maint-0.3.3'
2018-03-13 13:41:33 +01: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
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
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
Caio Valente
8775c93a99
Refactor: suppress duplicated functions from router.c and encapsulate NODE_DESC_BUF_LEN constant.
...
Also encapsulates format_node_description().
Closes ticket 25432.
2018-03-06 20:42:32 +01:00
Deepesh Pathak
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
Nick Mathewson
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
Nick Mathewson
e5a990fc5a
tweak changelog for 4187
2018-03-03 12:02:45 -05:00
Nick Mathewson
df9d2de441
Merge remote-tracking branch 'fristonio/ticket4187'
2018-03-03 12:02:30 -05:00
Nick Mathewson
338dbdab93
Merge branch 'maint-0.3.3'
2018-03-03 11:59:27 -05:00
Nick Mathewson
ccf0f77da1
changes file for 25378
2018-03-03 11:58:22 -05:00
Nick Mathewson
62482ea279
Merge branch 'maint-0.3.3'
2018-03-03 11:53:05 -05:00
Nick Mathewson
cc7de9ce1d
Merge branch 'ticket23814' into maint-0.3.3
2018-03-03 11:53:01 -05:00
Alex Xu (Hello71)
45d3b5fa4c
Remove uncompilable tor_mmap_file fallback. #25398
2018-03-02 09:51:53 -05:00
Nick Mathewson
d22963938f
Merge branch 'maint-0.3.3'
2018-03-01 16:10:47 -05:00
Nick Mathewson
f7eff2f8c5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-01 16:10:43 -05:00
Nick Mathewson
d01abb9346
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-01 16:07:59 -05:00
Nick Mathewson
d4a758e083
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-01 16:07:59 -05:00
Nick Mathewson
1fe0bae508
Forbid UINT32_MAX as a protocol version
...
The C code and the rust code had different separate integer overflow
bugs here. That suggests that we're better off just forbidding this
pathological case.
Also, add tests for expected behavior on receiving a bad protocol
list in a consensus.
Fixes another part of 25249.
2018-03-01 16:05:17 -05:00
Nick Mathewson
8b405c609e
Forbid "-0" as a protocol version.
...
Fixes part of 24249; bugfix on 0.2.9.4-alpha.
2018-03-01 16:05:17 -05:00
Nick Mathewson
a83650852d
Add another NULL-pointer fix for protover.c.
...
This one can only be exploited if you can generate a correctly
signed consensus, so it's not as bad as 25074.
Fixes bug 25251; also tracked as TROVE-2018-004.
2018-03-01 16:05:17 -05:00
Nick Mathewson
65f2eec694
Correctly handle NULL returns from parse_protocol_list when voting.
...
In some cases we had checked for it, but in others we had not. One
of these cases could have been used to remotely cause
denial-of-service against directory authorities while they attempted
to vote.
Fixes TROVE-2018-001.
2018-03-01 16:05:17 -05:00
Deepesh Pathak
130e2ffad7
Remove duplicate code between parse_{c,s}method in transport.c
...
- Merged common code in function parse_{c,s}method to a single function
- Removed duplicate code in transport.c
- Fixes #6236
2018-02-24 20:27:08 +05:30
Nick Mathewson
54e25ab124
Remove changes files for items already in 0.3.3.
2018-02-22 09:17:44 -05:00
Nick Mathewson
bcfb034957
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-21 11:53:50 -05:00
Nick Mathewson
62c88a6011
Merge branch 'maint-0.3.3'
2018-02-21 11:53:50 -05:00
Nick Mathewson
8a5cb58ad0
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-02-21 11:53:50 -05:00
Nick Mathewson
ac1942ac58
Update the .gitmodules to refer to project-level tor-rust-dependencies
...
Closes most of #25323 .
2018-02-21 11:53:04 -05:00
Nick Mathewson
a4ab273a0d
Merge remote-tracking branch 'fristonio/ticket-25261'
2018-02-20 10:03:52 -05:00
Nick Mathewson
bd71e0a0c8
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-16 09:54:13 -05:00
Nick Mathewson
2bcd264a28
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-16 09:48:11 -05:00
Nick Mathewson
cb92d47dec
Merge remote-tracking branch 'dgoulet/ticket24902_029_05' into maint-0.2.9
2018-02-16 09:41:06 -05:00
Nick Mathewson
9f1899fdfd
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-02-16 08:49:08 -05:00
Nick Mathewson
5c48f62e67
Merge branch 'maint-0.3.3'
2018-02-16 08:49:08 -05:00
Nick Mathewson
c67adddacb
Remove changes file for 24898-029 backports in maint-0.3.2
...
These patches were already merged, and so don't need a changes file
in these branches.
2018-02-16 08:48:46 -05:00
Nick Mathewson
8970058af6
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-02-16 08:47:41 -05:00
Nick Mathewson
1527032384
Merge branch 'maint-0.3.3'
2018-02-16 08:47:41 -05:00
Nick Mathewson
c8b087d901
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-16 08:47:41 -05:00
Roger Dingledine
d21e5cfc24
stop calling channel_mark_client in response to a create_fast
...
since all it does is produce false positives
this commit should get merged into 0.2.9 and 0.3.0 *and* 0.3.1, even
though the code in the previous commit is already present in 0.3.1. sorry
for the mess.
[Cherry-picked]
2018-02-16 08:46:57 -05:00
Roger Dingledine
2b99350ca4
stop calling channel_mark_client in response to a create_fast
...
since all it does is produce false positives
this commit should get merged into 0.2.9 and 0.3.0 *and* 0.3.1, even
though the code in the previous commit is already present in 0.3.1. sorry
for the mess.
2018-02-16 08:46:31 -05:00
Roger Dingledine
8d5dcdbda2
backport to make channel_is_client() accurate
...
This commit takes a piece of commit af8cadf3a9
and a piece of commit
46fe353f25, with the goal of making channel_is_client() be based on what
sort of connection handshake the other side used, rather than seeing
whether the other side ever sent a create_fast cell to us.
2018-02-16 08:39:10 -05:00
Neel Chauhan
c2fa743806
Remove the return value of node_get_prim_orport() and node_get_prim_dirport()
2018-02-16 08:20:33 -05:00
Nick Mathewson
b56fd17d00
Merge branch 'maint-0.3.3'
2018-02-15 21:05:12 -05:00
Nick Mathewson
d662d4470a
Merge remote-tracking branch 'dgoulet/ticket24343_033_01' into maint-0.3.3
2018-02-15 21:05:08 -05:00
Nick Mathewson
d9804691df
Merge remote-tracking branch 'ffmancera-1/bug18918'
2018-02-15 21:00:10 -05:00
Nick Mathewson
92a42f795c
Merge branch 'bug23909'
2018-02-15 20:56:23 -05:00
Nick Mathewson
8da6bfa5de
Merge branch 'bug24914'
2018-02-15 20:53:50 -05:00
Nick Mathewson
ed1d630f0e
Merge branch 'onion_ntor_malloc_less'
2018-02-15 20:40:03 -05:00
Nick Mathewson
a1dd8afc16
Merge branch '25162_zstd_static'
2018-02-15 20:28:07 -05:00
Nick Mathewson
3ca04aada2
Merge remote-tracking branch 'valentecaio/t-25081'
2018-02-15 20:23:23 -05:00
Nick Mathewson
3d7bf98d13
Merge remote-tracking branch 'valentecaio/t-24714'
2018-02-15 20:19:53 -05:00
Nick Mathewson
3c8a481599
Merge branch 'bug18105'
2018-02-15 20:17:31 -05:00
Nick Mathewson
3e2b48f8b4
Merge branch 'bug24484_squashed'
2018-02-15 20:13:53 -05:00
Nick Mathewson
4dc228e35b
Remove workaround code for systems where free(NULL) is busted.
...
Add an autoconf test to make sure we won't regret it.
Closes ticket 24484.
2018-02-15 20:13:44 -05:00
Deepesh Pathak
3553383312
ticket 25261: Removed multiple includes of transports.h in connection.c
2018-02-15 22:28:34 +05:30
Nick Mathewson
f6a230ec95
Merge remote-tracking branch 'mikeperry/bug24769'
2018-02-14 10:03:14 -05:00
Nick Mathewson
9e566f3a72
Merge branch 'tests_rust'
2018-02-13 18:12:01 -05:00
Nick Mathewson
cb9a322b67
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-13 16:55:19 -05:00
Nick Mathewson
f647035b37
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-13 16:55:18 -05:00
Taylor Yu
f0ed7895ca
fix make check-changes
2018-02-13 15:07:55 -06:00
Nick Mathewson
86f461e362
Merge remote-tracking branch 'dgoulet/ticket24902_029_05'
2018-02-13 15:00:43 -05:00
David Goulet
e7f6314782
Make check-changes happy
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-13 14:56:31 -05:00
David Goulet
b60ffc5ce0
Merge remote-tracking branch 'dgoulet/bug25223_029_01' into ticket24902_029_05
2018-02-13 13:11:10 -05:00
David Goulet
305e39d0f8
dos: Add extra safety asserts in cc_stats_refill_bucket()
...
Never allow the function to set a bucket value above the allowed circuit
burst.
Closes #25202
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-13 10:41:21 -05:00
David Goulet
4fe4f8179f
dos: Don't set consensus param if we aren't a public relay
...
We had this safeguard around dos_init() but not when the consensus changes
which can modify consensus parameters and possibly enable the DoS mitigation
even if tor wasn't a public relay.
Fixes #25223
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-13 10:35:41 -05:00
Nick Mathewson
412a8256a5
Remove 25170 changes file from master: it was already merged in 0.3.3.2-alpha
2018-02-13 08:51:29 -05:00
Nick Mathewson
b062730a11
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-13 08:50:59 -05:00
Nick Mathewson
5e3c545af7
Merge branch 'maint-0.3.2'
2018-02-13 08:50:59 -05:00
Nick Mathewson
17a923941a
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-13 08:50:58 -05:00
David Goulet
e658dad625
dirserv: Improve returned message when relay is rejected
...
Explicitly inform the operator of the rejected relay to set a valid email
address in the ContactInfo field and contact bad-relays@ mailing list.
Fixes #25170
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-13 08:47:42 -05:00
Fernando Fernandez Mancera
eb089ecaa0
Improve the documentation of AccountingStart parameter.
...
Fixes #23635 .
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
2018-02-12 17:10:04 +01:00
Nick Mathewson
91109bc813
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-12 08:33:47 -05:00
Nick Mathewson
e91bae66d8
Merge branch 'bug23318-redux_029' into maint-0.2.9
2018-02-12 08:33:03 -05:00
Nick Mathewson
b2c4d4e7fa
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 18:11:04 -05:00
Nick Mathewson
84c13336c4
Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9
2018-02-11 18:10:59 -05:00
Nick Mathewson
8939eaf479
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 18:09:35 -05:00
Nick Mathewson
848ba26c18
Merge branch 'ticket24315_029' into maint-0.2.9
2018-02-11 18:07:37 -05:00
Nick Mathewson
684d57fe8a
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-11 17:00:52 -05:00
Nick Mathewson
eccef6ba60
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-11 16:51:56 -05:00
Nick Mathewson
5dc785ceef
Merge remote-tracking branch 'public/bug21074_029' into maint-0.2.9
2018-02-11 16:51:53 -05:00
Nick Mathewson
3834441a72
chnages file for 25120
2018-02-11 16:14:19 -05:00
Nick Mathewson
4de20d1754
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-10 16:09:01 -05:00
Nick Mathewson
1df701c082
Merge branch 'maint-0.3.2'
2018-02-10 16:09:01 -05:00
Nick Mathewson
86583ad78e
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-10 16:09:00 -05:00
Nick Mathewson
320dac4602
Merge branch 'bug24978_029_enable' into maint-0.2.9
2018-02-10 16:08:58 -05:00
Nick Mathewson
e5d78c70b0
Begin work on a changelog
2018-02-09 15:58:26 -05:00
Nick Mathewson
549a450f52
Add a "make test-rust" target to run the rust tests only.
2018-02-08 17:51:57 -05:00
Nick Mathewson
8d142e2322
Merge remote-tracking branch 'isis/bug25127'
2018-02-08 17:16:14 -05:00
Nick Mathewson
84bc75b2e7
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-02-08 10:29:06 -05:00
Nick Mathewson
cce76fbbe2
Merge branch 'maint-0.3.2'
2018-02-08 10:29:06 -05:00
Nick Mathewson
04a8e81fa9
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-02-08 10:29:05 -05:00
Nick Mathewson
0ddc2dc531
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-02-08 10:29:05 -05:00
David Goulet
211fe44e07
dirserv: Improve returned message when relay is rejected
...
Explicitly inform the operator of the rejected relay to set a valid email
address in the ContactInfo field and contact bad-relays@ mailing list.
Fixes #25170
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-08 09:42:26 -05:00
Karsten Loesing
f1278b7e57
Update geoip and geoip6 to the February 7 2018 database.
2018-02-08 10:32:41 +01:00
David Goulet
652d3a5b66
Remove anything related to the old SocksSockets option
...
At this commit, the SocksSocketsGroupWritable option is renamed to
UnixSocksGroupWritable. A deprecated warning is triggered if the old option is
used and tor will use it properly.
Fixes #24343
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-07 14:05:33 -05:00
Nick Mathewson
12b58ba551
Merge remote-tracking branch 'dgoulet/ticket25163_033_01'
2018-02-07 12:46:27 -05:00
Nick Mathewson
78382d557a
Merge remote-tracking branch 'dgoulet/bug25113_029_01'
2018-02-07 11:33:14 -05:00
David Goulet
fe3dfe7e38
test: Bump to 10 msec gap in the monotonic test
...
On slow system, 1 msec between one read and the other was too tight. For
instance, it failed on armel with a 4msec gap:
https://buildd.debian.org/status/package.php?p=tor&suite=experimental
Increase to 10 msec for now to address slow system. It is important that we
keep this OP_LE test in so we make sure the msec/usec/nsec read aren't
desynchronized by huge gaps. We'll adjust again if we ever encounter a system
that goes slower than 10 msec between calls.
Fixes #25113
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-07 10:50:52 -05:00
Nick Mathewson
a45b56753c
changes file for 23650 typo fixes
2018-02-07 10:44:21 -05:00
David Goulet
93ebcc2b8f
rephist: Stop tracking relay connection status
...
Remove a series of connection counters that were only used when dumping the
rephist statistics with SIGUSR1 signal.
This reduces the or_history_t structure size.
Closes #25163
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-06 12:56:36 -05:00
Nick Mathewson
6961609a1c
Merge remote-tracking branch 'dgoulet/bug25116_029_01'
2018-02-06 12:13:41 -05:00
Nick Mathewson
a384937f84
Merge branch 'arma_bug22212_031'
2018-02-06 11:41:52 -05:00
Nick Mathewson
5a1e0bfcdc
Add a category for the 22212-forreal changes file
2018-02-06 11:41:31 -05:00
Nick Mathewson
87db5a6b75
Merge remote-tracking branch 'arma/bug22212'
2018-02-06 11:36:13 -05:00
Nick Mathewson
358b609e9d
Enable (safe) use of zstd static-only APIs
...
We'll only use these when the compile-time version and the run-time
version of the zstd library match. Part of ticket 25162.
2018-02-06 11:05:07 -05:00
Isis Lovecruft
7ea9e080c5
protover: Fix memleak in Rust implementation.
...
* FIXES #25127 : https://bugs.torproject.org/25127 .
2018-02-06 02:56:16 +00:00