Nick Mathewson
cd4ae97448
Merge branch 'maint-0.4.2'
...
"ours" to avoid version bump.
2019-11-12 16:39:44 -05:00
Nick Mathewson
70755eca00
Bump version to 0.4.2.4-rc.
2019-11-12 16:39:37 -05:00
Nick Mathewson
fc1316b559
Merge branch 'ticket32467'
2019-11-12 13:19:12 -05:00
Nick Mathewson
f221a7aaf6
Fold remainder of this-not-that.md into CodingStandards.md
2019-11-12 12:28:14 -05:00
Nick Mathewson
c11c1d0623
Merge remote-tracking branch 'tor-github/pr/1367'
2019-11-12 12:18:14 -05:00
Nick Mathewson
e39423c78c
Remove 01e-os-compat: the module docs cover this much better.
2019-11-12 12:14:56 -05:00
Nick Mathewson
6744f6b6bb
HACKING/design: move 01c-time.md into doxygen.
2019-11-12 12:14:14 -05:00
JeremyRand
f487da518a
Bug 19859: Fix double-free in unit test
2019-11-12 17:13:04 +00:00
Nick Mathewson
b0f9ecdbb1
Move 01g-strings.md into doxygen.
2019-11-12 12:09:53 -05:00
Nick Mathewson
d1a1631a05
01f-threads.md becomes threading.dox.
2019-11-12 12:05:05 -05:00
Nick Mathewson
91f377deec
HACKING/design: turn the remaining parts of crypto into a certs doc
2019-11-12 12:01:33 -05:00
Nick Mathewson
89396bc726
HACKING/design: remove 03-modules as superseded.
...
The src/feature directory documentation now covers this better.
2019-11-12 11:56:53 -05:00
Nick Mathewson
6d9db29dda
Document --dump-config.
...
Closes ticket 32467.
2019-11-12 08:19:35 -05:00
teor
233ccef6d8
Merge branch 'maint-0.4.2'
2019-11-12 10:10:01 +10:00
teor
9be51e8a8e
test/parseconf: Add tests for ignored options
...
These tests will also pass on 0.4.3, with the original implementation,
and with the new implementation in 32404.
Part of 32295 and 32404.
2019-11-12 10:09:40 +10:00
teor
3d6ec40e6a
Merge branch 'maint-0.4.2'
...
"git merge --strategy ours", because:
* 32295 is a quick fix for 0.4.2 only
* 32404 has a better implementation for master
2019-11-12 10:07:46 +10:00
teor
2ee04fc309
config: Log the option name when skipping an obsolete option
...
This is a basic fix for 0.4.2 only. The fix for 0.4.3 and later
is in 32404.
Fixes bug 32295; bugfix on 0.4.2.1-alpha.
2019-11-12 10:07:12 +10:00
Nick Mathewson
3d1a7d7dd7
Light grammar edits
2019-11-11 12:26:09 -05:00
Nick Mathewson
7c3378fb8d
Merge remote-tracking branch 'tor-github/pr/1338'
2019-11-11 12:20:14 -05:00
Nick Mathewson
01af3a55f4
Merge remote-tracking branch 'tor-github/pr/1524'
2019-11-11 11:57:31 -05:00
Nick Mathewson
4462766d32
Merge branch 'ticket32404'
2019-11-11 11:54:14 -05:00
Nick Mathewson
9d562bba40
clarify OBSOLETE vs IGNORE.
2019-11-11 11:54:02 -05:00
liberat
4ae77e15d0
Test case for SOCKS5 RESOLVE_PTR with IPv6 address in brackets.
...
This was not supported previously, but provides symmetry with other
SOCKS requests, which also support addresses written in brackets.
2019-11-11 15:41:56 +00:00
Nick Mathewson
2b3dc3384c
Merge branch 'ticket32385'
2019-11-11 10:38:10 -05:00
Nick Mathewson
b1083584c7
Clarify that "missing-doc-warnings" makes doxygen warnings nonfatal
2019-11-11 10:38:04 -05:00
liberat
b7c7474130
Test case for SOCKS5 RESOLVE_PTR with binary IPv6 address.
...
This tests the handling of binary v6 addresses, which works correctly
in older versions but was broken in 0.3.5.1-alpha.
2019-11-11 15:35:21 +00:00
liberat
4e4c4e72d7
Handle binary IPv6 addresses and bracketed strings in RESOLVE_PTR.
...
When a SOCKS5 client sends a RESOLVE_PTR request, it must include
either an IPv4 or IPv6 address. In the past this was required to be a
binary address (address types 1 or 4), but since the refactoring of
SOCKS5 support in Tor 0.3.5.1-alpha, strings (address type 3) are also
allowed if they represent an IPv4 or IPv6 literal.
However, when a binary IPv6 address is provided,
parse_socks5_client_request converts it into a string enclosed in
brackets. This doesn't match what string_is_valid_ipv6_address
expects, so this would fail with the error "socks5 received
RESOLVE_PTR command with hostname type. Rejecting."
By replacing string_is_valid_ipv4_address/string_is_valid_ipv6_address
with tor_addr_parse, we accept strings both with and without brackets.
This fixes the handling of binary addresses, and also improves
symmetry with CONNECT and RESOLVE requests.
Fixes bug 32315.
2019-11-11 15:34:38 +00:00
Nick Mathewson
ee33bf5ee0
Doxygen: close an unterminated <b>.
2019-11-11 10:23:41 -05:00
Nick Mathewson
ff930c3305
doxygen: use <tt> and # to avoid interpreting # as a link.
2019-11-11 10:23:13 -05:00
Nick Mathewson
29eb7b07ef
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-11-11 10:14:04 -05:00
Nick Mathewson
a920597f62
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-11-11 10:14:04 -05:00
Nick Mathewson
eb8ea92cf9
Merge branch 'maint-0.4.2'
2019-11-11 10:14:04 -05:00
Nick Mathewson
329aa1c48e
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-11-11 10:14:03 -05:00
Nick Mathewson
7beaaed245
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-11-11 10:14:03 -05:00
George Kadianakis
8344776224
Merge branch 'tor-github/pr/1504'
2019-11-11 14:47:33 +02:00
teor
8af8ed72b2
Merge branch 'maint-0.4.2'
2019-11-11 14:20:03 +10:00
teor
8b1f99c29d
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-11-11 14:19:55 +10:00
teor
7043be968a
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-11-11 14:19:47 +10:00
teor
29940511e3
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-11-11 14:19:39 +10:00
teor
2abff832dd
Appveyor: Install OpenSSL to resolve a header/library mismatch
...
Install the mingw OpenSSL package in Appveyor. This makes sure that
the OpenSSL headers and libraries match in Tor's Appveyor builds.
(This bug was triggered by an Appveyor image update.)
Fixes bug 32449; bugfix on 0.3.5.6-rc.
2019-11-11 13:19:15 +10:00
teor
2d651f4f6a
test/parseconf: Add basic parsing tests
...
And document the "%include" behaviour.
Closes 32450.
2019-11-11 13:04:28 +10:00
Nick Mathewson
2d508f8fa5
Not const.
2019-11-10 16:14:38 -05:00
Nick Mathewson
a6d22d7fc2
Improve subsys documentation; add initialization documentation.
2019-11-10 16:13:23 -05:00
Nick Mathewson
baddb30889
doxygen: add a command for linking to our bugtracker
2019-11-10 15:49:45 -05:00
Karsten Loesing
853b6ad095
Update geoip and geoip6 to the November 6 2019 database.
2019-11-09 10:10:19 +01:00
Nick Mathewson
a08969e460
Refactor "OBSOLETE" type
...
It no longer warns, and is now defined in terms of an "IGNORE" type.
(The "IGNORE" type is the same as "OBSOLETE", except that it is not
reported as obsolete. It should be useful for disabled modules.)
Closes ticket 32404.
2019-11-07 11:01:25 -05:00
Nick Mathewson
36af84ba50
New configuration flag to warn that a variable is obsolete.
...
Part of 32404.
2019-11-07 09:14:44 -05:00
Nick Mathewson
f6c9ca3a1d
Merge branch 'config_subsys_v4'
2019-11-07 08:59:42 -05:00
Nick Mathewson
c9b2fe0460
Changes file for 32415 (struct name uniformity)
2019-11-07 08:56:18 -05:00
Nick Mathewson
31a6a6512f
Rename probability distribution names to end with "_t".
...
I needed to do this by hand, since we also use these for function
names, variable names, macro expansion, and a little token pasting.
2019-11-07 08:56:07 -05:00
