Suphanat Chunhapanya
119004e87d
circuit: Implement haproxy
2020-01-06 13:39:10 -05:00
Suphanat Chunhapanya
52e59640f9
circuit: Refactor connection_proxy_connect
...
Since connection_proxy_connect is too long now, it's better to create
new functions (connection_https_proxy_connect,
connection_socks4_proxy_connect, and connection_socks5_proxy_connect) to
make connection_proxy_connect shorter.
2019-10-17 15:33:16 +08:00
Suphanat Chunhapanya
101bdeb02d
doc: TCPProxy is not supported in TOR_PT_PROXY
...
Because we need to construct the URI using the TCPProxy configuration
but we don't have a standard URI scheme for haproxy yet, we decided to
not support TCPProxy in TOR_PT_PROXY now. There is no problem with
HTTPSProxy, Socks4Proxy, or Socks5Proxy because they all have standard
URI schemes.
2019-10-17 15:33:16 +08:00
Suphanat Chunhapanya
9dd04396ba
test: Add TCPProxy option for haproxy protocol
2019-10-17 15:33:16 +08:00
Suphanat Chunhapanya
5a6a6ed33c
config: Add TCPProxy option for haproxy protocol
...
Read the TCPProxy option and put in or_options_t.
2019-10-17 15:33:16 +08:00
Suphanat Chunhapanya
1b07a2d7bf
doc: Add TCPProxy option
...
TCPProxy is used for proxying all outgoing OR connections through some
proxy with the protocol specified in the option.
2019-10-17 15:33:16 +08:00
teor
5f3233ce1a
Merge branch 'maint-0.4.2'
2019-10-17 14:52:19 +10:00
teor
8ac9af2330
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-17 14:52:15 +10:00
teor
400e31ad19
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-17 14:52:06 +10:00
teor
e483257e1b
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-17 14:51:58 +10:00
teor
4b8e5ea0dc
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-17 14:51:50 +10:00
teor
92c4dc9b14
Merge remote-tracking branch 'tor-github/pr/1373' into maint-0.4.2
2019-10-17 14:51:30 +10:00
teor
13daf339a9
Merge remote-tracking branch 'tor-github/pr/1372' into maint-0.4.1
2019-10-17 14:51:02 +10:00
teor
702aa8f775
Merge remote-tracking branch 'tor-github/pr/1370' into maint-0.3.5
2019-10-17 14:50:28 +10:00
teor
c660f47960
Merge remote-tracking branch 'tor-github/pr/1369' into maint-0.2.9
2019-10-17 14:49:52 +10:00
teor
e6bb23434e
Merge remote-tracking branch 'tor-github/pr/1419'
...
Obviously correct fixes to code that's already been reviewed.
2019-10-17 13:47:42 +10:00
Nick Mathewson
2c97cf3add
Merge remote-tracking branch 'tor-github/pr/1329'
2019-10-16 12:31:47 -04:00
Nick Mathewson
3430b487d6
hs_cell.[ch]: repair doxygen.
2019-10-16 12:08:38 -04:00
Nick Mathewson
6a2057a9f2
or_options_st.h: repair some doxygen comments.
2019-10-16 12:05:17 -04:00
Nick Mathewson
18ea8855f2
shared_random.[ch]: repair doxygen comments
2019-10-16 12:04:53 -04:00
Nick Mathewson
17b88241db
hs_cache.[ch]: repair doxygen comments.
2019-10-16 11:57:44 -04:00
Nick Mathewson
1b66668e26
hs_client.[ch]: fix doxygen comments by using /**.
2019-10-16 11:51:47 -04:00
Nick Mathewson
06367299c2
shared_random_state.[ch]: Repair a bunch of doxygen comments
...
These need to start with /**, not /*.
2019-10-16 11:44:30 -04:00
Nick Mathewson
123fe6bdc5
hs_common.[ch]: repair doxygen comments by replacing /* with /**
2019-10-16 11:39:10 -04:00
Nick Mathewson
2127d797e9
hs_descriptor.[ch]: repair doxygen comments.
...
These are yet more that were not made with "/**"
2019-10-16 11:33:03 -04:00
Nick Mathewson
ca26ea03fc
hs_service.c: repair doxygen comments
2019-10-16 11:26:20 -04:00
Nick Mathewson
0e9e5c37b7
hs_service.h: repair doxygen comments.
2019-10-16 11:18:43 -04:00
Nick Mathewson
ba44423cfc
address_set.c: doxygen comment repair.
2019-10-16 11:15:25 -04:00
Nick Mathewson
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
Nick Mathewson
ce0739314b
voting_schedule: fix doxygen comments to use /**
...
Previously some of the comments here used /*.
2019-10-16 11:08:34 -04:00
Nick Mathewson
911adb4d2b
Make doc/doxygen before running doxygen.
...
This makes out-of-tree doxygen builds work.
Closes ticket 32113.
2019-10-16 10:31:44 -04:00
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
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
