Nick Mathewson
8413eec2c7
Merge branch 'ticket32099'
2019-10-16 10:28:03 -04:00
Nick Mathewson
bcbf3b7479
Merge branch 'ticket32110'
2019-10-16 10:14:51 -04:00
Nick Mathewson
593acfabb3
Doxygen: stop producing LaTeX.
...
Running doxygen with latex gave us all manner of unicode issues,
slowed down the "make doxygen" target by a lot, and added several
latex dependencies... all to produce a 4000-page reference manual
which is probably not what anybody wanted.
Closes ticket 32099.
2019-10-16 09:56:31 -04:00
Nick Mathewson
08fd551e9f
Regenerate practracker exceptions file for 0.4.3 progress.
2019-10-16 09:15:00 -04:00
Nick Mathewson
8ce17e0b35
practracker: add a missing #.
2019-10-16 09:15:00 -04:00
Nick Mathewson
033d76b0e0
Doxygen: update doxyfile to a more recent version.
...
I have left the settings at their old values, except when they
referred to nonexistent files.
Closes ticket 32110
2019-10-16 09:07:21 -04:00
Nick Mathewson
f9fac733b9
Doxygen: Fix things that looked like links.
...
Doxygen thinks that saying #foo is linking to a "foo" anchor
someplace.
2019-10-16 08:44:35 -04:00
Nick Mathewson
591420df20
Doxygen: fix unrecognized commands.
...
Doxygen seems to interpret anything starting with \ as a command,
even when we don't mean it that way.
2019-10-16 08:39:41 -04:00
Nick Mathewson
98735c40b6
Doxygen: fix warnings about mismatched HTML tags.
2019-10-16 08:27:03 -04:00
Nick Mathewson
5e5e655e32
Doxygen: Fix mismatched filenames.
...
In 8 places, our \file declarations didn't match the actual files
they were in.
2019-10-16 08:18:26 -04:00
Roger Dingledine
71daad1692
never say XB, always XBytes
...
fix three more instances in the man page that we forgot to fix
in earlier attempts
2019-10-16 03:31:23 -04:00
David Goulet
09e6c0f7c7
hs-v3: Fix possible memory leak in error code path
...
Found by coverity CID 1454769.
There were a second possible leak that is also fixed in this commit.
Fixes #32063
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-15 08:54:11 -04:00
teor
11b5946e49
scripts: Fix a git script comment
2019-10-15 13:58:53 +10:00
teor
028987a0a1
scripts: Merge forward test branch _042 into test branch _master
...
Fixes an issue where test branch _041 was merged into _042 and _master.
This issue only affects test branch mode (-t).
2019-10-15 13:36:56 +10:00
Nick Mathewson
dfe7f004df
Merge branch 'design_revision'
2019-10-14 15:56:49 -04:00
Nick Mathewson
6bbeb08f92
Merge branch 'maint-0.4.2'
2019-10-14 15:55:27 -04:00
Nick Mathewson
eebd2d44a1
Merge remote-tracking branch 'tor-github/pr/1393' into maint-0.4.2
2019-10-14 15:55:13 -04:00
Nick Mathewson
1332d3b6fa
doc/HACKING/design: address comments from ahf
2019-10-14 15:53:04 -04:00
Nick Mathewson
358436592b
Edit 01b-collections.md a bit for md and missing content
2019-10-14 15:05:47 -04:00
Nick Mathewson
77accf937e
Edit 01a-memory.md
2019-10-14 15:02:26 -04:00
Nick Mathewson
9201bbd96c
Replace a unicode character which doxygen cannot handle.
...
Merging without review, as this is an editorial fix in a comment.
2019-10-14 14:05:50 -04:00
Nick Mathewson
8ef5d96c2e
Rewrite "common" overview into a "lib" overview.
2019-10-14 13:49:27 -04:00
Nick Mathewson
908070bbd5
Rename common-utils to lib-overview.
2019-10-14 10:59:32 -04:00
Nick Mathewson
1b996b01f6
00-overview.md: Revise to describe intended document structure
2019-10-14 10:58:03 -04:00
Nick Mathewson
78f4e29219
git scripts: add maint/release-0.4.2.
2019-10-11 17:26:34 -04:00
Nick Mathewson
215a6debba
Merge branch 'maint-0.4.2'
...
"Ours" merge to avoid takign ".enable_practracker_in_hooks"
2019-10-11 17:20:54 -04:00
Nick Mathewson
a4790e7d4b
maint-0.4.2: remove ".enable_practracker_in_hooks".
2019-10-11 17:18:55 -04:00
Nick Mathewson
61fe3f448c
Bump master to 0.4.3.0-alpha-dev.
2019-10-11 17:15:04 -04:00
Nick Mathewson
2e5724d153
Merge branch 'ticket31682_042_01_squashed'
2019-10-11 10:21:58 -04:00
Nick Mathewson
46efc0ff35
Correct comment on build_establish_intro_dos_extension
2019-10-11 10:21:45 -04:00
David Goulet
b356b3907a
hs-v3: Fix implicit ssize_t to size_t conversion
...
Found by Coverity.
Fixes #31682
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-11 10:20:36 -04:00
Nick Mathewson
0d82a8be77
Merge remote-tracking branch 'tor-github/pr/1394'
2019-10-09 16:44:12 -04:00
Nick Mathewson
ab064cf762
Merge remote-tracking branch 'tor-github/pr/1399'
2019-10-09 16:37:47 -04:00
Nick Mathewson
755f001600
Merge remote-tracking branch 'tor-github/pr/1401'
2019-10-09 16:29:46 -04:00
Nick Mathewson
99809834a7
Merge branch 'bug30344_squashed_035'
2019-10-09 16:26:31 -04:00
George Kadianakis
841cff6e4f
Stop libevent from reading data from closed connections.
...
Code adapted from Rob's proposed patch in #30344 .
Also add a comment in connection_mark_for_close_internal_() on why we should
not be adding extra code there without a very good reason.
2019-10-09 16:24:49 -04:00
Nick Mathewson
4ab85f4928
Document tor-coccinelle.h
2019-10-09 09:23:49 -04:00
Neel Chauhan
7c1b2fceb7
test: New behavior on IP retry for HSv3
...
Unit test for #31652 where if we are over the retry limit for the IP but we
have an established circuit, we don't remove the IP.
Part of #31652
2019-10-08 17:02:47 -04:00
David Goulet
f50de3a918
hs-v3: Do not remove intro point if circuit exists
...
When considering introduction point of a service's descriptor, do not remove
an intro point that has an established or pending circuit.
Fixes #31652
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-08 17:02:47 -04:00
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