3539fdfd7a
Merge remote-tracking branch 'tor-github/pr/1168'
2019-10-21 13:09:48 +10:00
1697019d5f
core: tabify a line in include.am
2019-10-18 16:56:50 +10:00
800b823c29
Merge branch 'cmdline_refactor'
2019-10-17 12:01:45 -04:00
d97d7f0e48
Use an enum for quiet_level.
2019-10-17 12:01:40 -04:00
39cf575ed4
Merge remote-tracking branch 'tor-github/pr/1416'
2019-10-17 08:25:11 -04:00
ba44423cfc
address_set.c: doxygen comment repair.
2019-10-16 11:15:25 -04:00
a54c98007a
channel.h: fix various doxygen warnings
...
There were a bunch of items where the doxygen comments were
formatted incorrectly (with /* instead of /**)
2019-10-16 11:11:43 -04:00
87afe5c260
Rename authcert_members.i to .h, and have it define a macro.
...
Including a file in the middle of a declaration seems to confuse
Doxygen, and Coccinelle doesn't much like it either.l
2019-10-16 10:53:01 -04:00
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
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
98735c40b6
Doxygen: fix warnings about mismatched HTML tags.
2019-10-16 08:27:03 -04:00
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
99809834a7
Merge branch 'bug30344_squashed_035'
2019-10-09 16:26:31 -04:00
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
c42a79499a
Extract the enumeration that tells Tor what command it is running.
2019-10-08 12:59:18 -04:00
014abf86e5
Merge branch 'tor-github/pr/1344'
2019-10-02 10:37:49 -04:00
53116ca0b7
Re-run "make autostyle" with improved annotate_ifdef_directives
2019-09-30 08:57:37 -04:00
37c616aeaf
Merge branch 'bug31466_035' into bug31466_042
2019-09-18 15:48:25 -04:00
bf4a27c0ea
Merge branch 'bug31466_029' into bug31466_035_tmp
2019-09-18 15:42:40 -04:00
2d744de355
Correct a comment in channel_tls_process_cell.
2019-09-17 11:42:19 -04:00
7f5c6a603c
Move PROCESS_CELL macros outside of channel_tls_process_cell().
...
These macros are used in multiple functions, and as such really
don't belong within a single function.
Also #undef them once we are done with them.
This change makes practracker pass again.
2019-09-17 11:40:14 -04:00
4d7ce27105
Merge branch 'bug31107_041' into bug31107_master
2019-09-17 09:16:53 -04:00
6ee19e57c2
Merge branch 'bug31107_040' into bug31107_041
2019-09-17 09:16:52 -04:00
da8ba5010b
Merge branch 'bug31107_035' into bug31107_040
2019-09-17 09:16:52 -04:00
7589995111
Merge branch 'maint-0.3.5' into bug31107_035
2019-09-17 09:16:52 -04:00
585eaa123f
Merge branch 'tor-github/pr/1323'
2019-09-17 14:51:43 +03:00
0327f9a075
Merge branch 'ticket31687_035' into ticket31687_040
2019-09-12 09:51:04 -04:00
ae6e60281c
Update include.am files to refer to new location of confparse.[ch]
...
Tests should now pass again.
2019-09-11 10:22:01 -04:00
a90d1918af
Update #includes to point to confparse.h in its new location.
...
This commit was automatically generated by running
scripts/maint/rectify_include_paths.py .
2019-09-11 10:17:20 -04:00
97f7efa9e3
pf: when extracting an IPv6 address, make sure we got an IPv6 address
...
Our code assumes that when we're configured to get IPv6 addresses
out of a TRANS_PF transparent proxy connection, we actually will.
But we didn't check that, and so FreeBSD started warning us about a
potential NULL pointer dereference.
Fixes part of bug 31687; bugfix on 0.2.3.4-alpha when this code was
added.
2019-09-10 11:07:25 -04:00
a642a4cbd7
Merge branch 'ticket30924_042_04_squashed' into ticket30924_042_04_squashed_merged
2019-09-09 11:10:53 -04:00
1203e137be
Merge commit '763fd0ad66' into maint-0.4.0
...
tor-github/pr/1174, but with the last commit re-worded to remove
the fixup, because fixups break our push rules.
2019-09-05 11:42:26 +10:00
92a8573d22
Merge branch 'tor-github/pr/1258'
2019-08-27 11:45:18 +03:00
724d9eb84b
hs-v3: Parse ESTABLISH_INTRO cell extension
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-08-26 15:53:46 +03:00
6c79172924
hs-v3: Add protover HSIntro=5
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-08-26 15:53:46 +03:00
14654d5c97
Remove the unused circuit_type field from hs_ident_circuit_t and hs_ident_circuit_new()
2019-08-23 14:04:05 -04:00
2780cbb9cb
Merge branch 'ticket30935' into ticket30935_merged
2019-08-22 17:25:35 -04:00
cc48eff2d3
Merge branch 'ticket31176' into ticket31176_merged
2019-08-21 09:46:20 -04:00
e5812c91d6
Merge remote-tracking branch 'tor-github/pr/1231'
2019-08-19 11:34:27 -04:00
29bd43ab03
Merge remote-tracking branch 'tor-github/pr/1224'
2019-08-19 11:26:58 -04:00
b257e8e553
Merge remote-tracking branch 'mike/bug31356+logs-rebased2' into bug31356_final
2019-08-19 17:53:00 +03:00
2ea2d6f30a
Clarify comment for bug30942 and improve logline.
2019-08-12 14:24:11 -05:00
b2821b72bc
Bug 31356: Propogate protover padding support to circpad
2019-08-12 14:06:08 -05:00
b14bb12e39
Bug 31356: Bump protover for new padding machines
...
By binding the protover numbering to specific padding machines, we can make
our padding negotiation simpler. We probably should have done this in the
first place.
This has the side effect that earlier 0.4.1.x-alpha clients won't negotiate
with 0.4.1.x-stable relays, and 0.4.1.x-stable clients won't negotiate with
earlier 0.4.1.x-alpha relays (or 0.4.0.x relays). Since we don't support
alphas after the stable is released, this is fine, so long as it gets in
before the first stable of 0.4.1.x.
2019-08-12 14:02:35 -05:00
f6bc9d7c7e
Bug 30992: Demote logline of wronghop padding to protocol warn.
...
This can happen, it's not great, but it's not the worst thing in the world
either. Deferring full fix for 0.4.2/later.
2019-08-12 13:46:32 -05:00
ccd16caeac
Additional circpad diagnostic logs
...
Also add controller circuit id to all relevant circpad loglines. This will
make debugging any future issues like #30992 much easier.
2019-08-12 13:46:32 -05:00
20943d00f1
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-12 13:10:05 +10:00
d253b31cec
Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5
2019-08-12 09:54:35 +10:00
a92b05392e
Merge remote-tracking branch 'tor-github/pr/1056' into maint-0.3.5
2019-08-12 09:51:35 +10:00
e3ba9b7a78
Merge remote-tracking branch 'tor-github/pr/920' into maint-0.3.5
2019-08-09 14:00:01 +10:00
teor
Nick Mathewson
George Kadianakis
David Goulet
Neel Chauhan
Mike Perry