David Goulet
1f60337da4
Merge branch 'tor-github/pr/1381'
2019-10-08 14:49:39 -04:00
Nick Mathewson
911b16e6e7
config.c: make a couple of arguments const.
...
These functions do not modify their inputs, so they can take const
arguments.
2019-10-08 12:59:22 -04:00
Nick Mathewson
bd5ce112c9
Use C99 struct-initializer syntax in COMMANDLINE_ONLY_OPTIONS
...
I'm about to add more fields to this table, and this syntax change
will make it easier to do so.
2019-10-08 12:59:22 -04:00
Nick Mathewson
6cea2bd498
Document takes_argument_t and its members.
2019-10-08 12:59:22 -04:00
Nick Mathewson
4c25ea6703
Rename TAKES_NO_ARGUMENT to ARGUMENT_NONE.
...
I'm doing this for consistency, so that all the values for this enum
have the same prefix.
This is an automated commit, generated by the following shell commands:
for fn in $(git ls-tree --name-only -r HEAD src |grep '\.[ch]$'); do \
perl -i -pe 's!\bTAKES_NO_ARGUMENT\b!ARGUMENT_NONE!g;' "$fn"; \
done
2019-10-08 12:59:22 -04:00
Nick Mathewson
c42a79499a
Extract the enumeration that tells Tor what command it is running.
2019-10-08 12:59:18 -04:00
George Kadianakis
081bd37315
Fix flapping of test_service_intro_point() unittest.
2019-10-08 19:00:43 +03:00
Nick Mathewson
7a26f14a37
Merge remote-tracking branch 'tor-github/pr/1317'
2019-10-07 10:23:44 -04:00
Nick Mathewson
56e8d84ea3
Merge branch 'ticket31548_035_01_squashed'
2019-10-07 10:21:40 -04:00
David Goulet
984a28f3e5
hs-v3: Make service pick the exact amount of intro points
...
When encoding introduction points, we were not checking if that intro points
had an established circuit.
When botting up, the service will pick, by default, 3 + 2 intro points and the
first 3 that establish, we use them and upload the descriptor.
However, the intro point is removed from the service descriptor list only when
the circuit has opened and we see that we have already enough intro points, it
is then removed.
But it is possible that the service establishes 3 intro points successfully
before the other(s) have even opened yet.
This lead to the service encoding extra intro points in the descriptor even
though the circuit is not opened or might never establish (#31561 ).
Fixes #31548
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-07 10:20:09 -04:00
Nick Mathewson
58b87a2c59
Merge remote-tracking branch 'tor-github/pr/1379'
2019-10-07 10:15:46 -04:00
Nick Mathewson
52194c8681
Merge remote-tracking branch 'tor-github/pr/1390'
2019-10-07 10:13:32 -04:00
Nick Mathewson
5fb5019a94
bump to 0.4.2.2-alpha-dev
2019-10-07 09:32:26 -04:00
Roger Dingledine
aa56465934
fix typo in how-to-review guidelines
2019-10-07 00:48:11 -04:00
Nick Mathewson
fdfb4b196b
Use {mock,unmock}_hostname_resolver() in relevant tests
...
These tests all invoke the hostname resolver in one way or another,
and therefore potentially block if our DNS server is missing,
absent, or extremely slow. Closes ticket 31841.
2019-10-04 08:03:19 -04:00
Nick Mathewson
4a0749596c
Add a mock replacement for blocking hostname resolution
...
Based on examination of our tests, this mock function accepts
"localhost" and "torproject.org", and rejects everything else.
2019-10-04 08:03:19 -04:00
Nick Mathewson
9c24ceeb3f
Make tor_addr_lookup_host_impl mockable.
2019-10-04 08:02:56 -04:00
teor
ff304f3be7
tls: Log TLS read buffer length bugs once
...
Rather than filling the logs with similar warnings.
Fixes bug 31939; bugfix on 0.3.0.4-rc.
2019-10-04 12:33:34 +10:00
teor
e5b8bd38ab
Merge remote-tracking branch 'tor-github/pr/1392'
2019-10-04 11:26:43 +10:00
David Goulet
52b7ae71b3
hs: ADD_ONION NEW:BEST now defaults to ED25519-V3
...
From RSA1024 (v2) to v3 now.
Closes #29669
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-03 15:43:03 -04:00
Nick Mathewson
c8df2c7205
Pick a release date for 0.4.2.2-alpha
2019-10-03 14:58:51 -04:00
Nick Mathewson
db976cd927
Light edits on 0.4.2.2-alpha changelog.
2019-10-03 12:34:21 -04:00
Nick Mathewson
5ae1a574dc
lightly sort changelog entries
2019-10-03 12:24:47 -04:00
Nick Mathewson
0ef59dd09b
Run format_changelog
2019-10-03 12:23:05 -04:00
Nick Mathewson
519afb0ece
Sort changes entries into a changelog for 0.4.2.2-alpha
2019-10-03 12:22:46 -04:00
George Kadianakis
9309eaf8ea
Merge branch 'tor-github/pr/1377'
2019-10-03 19:13:57 +03:00
George Kadianakis
3778b97cab
Merge branch 'tor-github/pr/1276'
2019-10-03 19:13:02 +03:00
Nick Mathewson
49d6990cae
Unit tests for dirserv_reject_tor_version().
2019-10-03 19:12:52 +03:00
Nick Mathewson
4d4e2abd2f
Authorities reject relays running unsupported Tor release series.
...
Our minimum version is now 0.2.9.5-alpha. Series 0.3.0, 0.3.1,
0.3.2, 0.3.3, and 0.3.4 are now rejected.
Also, extract this version-checking code into a new function, so we
can test it.
Closes ticket 31549.
Also reject 0.3.5.0 through 0.3.5.6-rc as unstable.
2019-10-03 19:12:46 +03:00
Nick Mathewson
065e467e7c
bump to 0.4.2.2-alpha
2019-10-03 12:07:50 -04:00
Nick Mathewson
05a324b564
Merge remote-tracking branch 'tor-github/pr/1376'
2019-10-03 09:19:37 -04:00
Nick Mathewson
5fd137c482
Merge remote-tracking branch 'tor-github/pr/1358'
2019-10-03 09:11:49 -04:00
Nick Mathewson
de7fcae72a
Merge remote-tracking branch 'tor-github/pr/1382'
2019-10-03 09:08:23 -04:00
Nick Mathewson
ac8f6d51f4
Unify backend implementations for blocking hostname lookup
...
We have a getaddrinfo() implementation that we prefer, and a
gethostbyname*() implementation that we fall back on. Give them
both the same interface, and let them be called by the same name.
This is a preparatory step for making them both mockable.
2019-10-03 07:47:25 -04:00
Nick Mathewson
b2802ae3c3
util/map_anon_nofork: Add a cast to avoid passing -48 to memset
...
This fixes coverity CID 1454593, and bug 31948. Bug not in any
released version of Tor.
2019-10-03 07:21:25 -04:00
teor
8c4c58cc8d
configure: List the env vars needed if pkg-config doesn't work
...
Part of 31922.
2019-10-03 16:53:12 +10:00
teor
80bcd66213
configure: Fix a typo in the systemd version message
2019-10-03 16:32:30 +10:00
teor
f0993d3831
configure: Give a more useful message when pkg-config fails
...
When pkg-config is not installed, or a library that depends on
pkg-config is not found, tell the user what to do to fix the
problem.
Fixes bug 31922; bugfix on 0.3.1.1-alpha.
2019-10-03 16:31:20 +10:00
teor
3d17fafa04
control/control: Refactor some error handling code
...
Split some protocol error handling out of
connection_control_process_inbuf().
This refactor reduces the size of a practracker exception.
Closes 31840.
2019-10-03 11:35:42 +10:00
Nick Mathewson
bca30bcb90
Merge remote-tracking branch 'tor-github/pr/1374'
2019-10-02 19:19:11 -04:00
David Goulet
ca1f18c159
Merge branch 'tor-github/pr/1385'
2019-10-02 14:15:31 -04:00
David Goulet
014abf86e5
Merge branch 'tor-github/pr/1344'
2019-10-02 10:37:49 -04:00
David Goulet
40be20d542
Merge branch 'tor-github/pr/1363'
2019-10-02 10:34:46 -04:00
Nick Mathewson
a74c180691
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-02 08:01:34 -04:00
Nick Mathewson
4dcbbe4166
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-02 08:01:34 -04:00
Nick Mathewson
c81e1e4542
Merge branch 'maint-0.4.1'
2019-10-02 08:01:34 -04:00
Nick Mathewson
7b9cb4c47b
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-02 08:01:33 -04:00
Karsten Loesing
90de776ea9
Update geoip and geoip6 to the October 1 2019 database.
2019-10-02 11:11:27 +02:00
teor
3f94441bfe
log: fix a typo in the function comment for log_fn_()
...
Closes 31923.
2019-10-02 12:12:26 +10:00
teor
b0bf7e7b60
Travis: Allow the build to finish before the macOS Rust job
...
When we merged TOR_RUST_VERSION from master, the allow_failures rule
did not match any more. Update it to make it match.
Closes 31859 for master.
2019-10-02 10:09:02 +10:00