91f04d006b
Merge branch 'tor-github/pr/1165'
2019-07-24 12:29:57 +03:00
ab1f82ea2a
Merge branch 'ticket24963_042_02'
2019-07-23 14:03:30 -04:00
df12ff3dea
Add a test for disallowing single-hop introductions.
...
Code from dgoulet.
2019-07-23 12:42:33 -04:00
f14ce4bce6
Allow NULL circ->p_chan in circuit_is_suitable_for_introduce1()
...
This shouldn't be possible while Tor is running, but the tests can
hit this code. Rather than force the tests to add a dummy channel
object, let's just tolerate their incompletely built circuits.
2019-07-23 12:36:40 -04:00
ab1f39322c
Merge remote-tracking branch 'tor-github/pr/1185'
2019-07-23 12:32:14 -04:00
f6db290e5a
Merge remote-tracking branch 'tor-github/pr/1186'
2019-07-23 12:30:19 -04:00
ef2dd1ba96
Merge branch 'tor-github/pr/1116'
2019-07-23 09:46:29 -04:00
2fce1274de
Merge branch 'tor-github/pr/1153'
2019-07-23 09:43:36 -04:00
f7dc920f4b
Merge branch 'maint-0.4.1'
2019-07-23 09:39:51 -04:00
c541258fac
Merge branch 'tor-github/pr/1158' into maint-0.4.1
2019-07-23 09:39:43 -04:00
fdfee3d06f
Changes file for #31113 .
2019-07-23 12:44:43 +03:00
c2f6064325
Improve circpad documentation.
...
Patch by Tobias Pulls.
2019-07-23 12:44:43 +03:00
aed82bf410
Add changes file for #31112 and #31098 .
2019-07-23 11:52:25 +03:00
fd1f285189
transition when we send our first padding packet, not on received
2019-07-23 11:52:25 +03:00
5f95b37f6c
remove specified target_hopnum from relay-side machines (only for origin-side machines)
2019-07-23 11:52:25 +03:00
5303dbe624
Merge branch 'tor-github/pr/1152'
2019-07-04 17:14:06 +03:00
85473f9aaf
typo fix
2019-07-03 16:01:05 -04:00
ebf1fc64fe
clarify a comment in the tor-exit-notice text
...
(a relay operator in #tor-relays just now was confused and thought
that dirportfrontpage could serve multiple files, like a real webserver.)
2019-07-03 15:56:17 -04:00
3e34840a77
Make config_lines_eq() take const arguments.
2019-07-03 10:27:38 -04:00
daed2e39ad
Revert "Add a function to append an existing line to a config line list."
...
This reverts commit 5a2ab886ba
2019-07-03 10:21:49 -04:00
e3ccf37e25
Fix @file directive in var_type_def_st.h
2019-07-03 10:19:57 -04:00
fdbd139495
Merge remote-tracking branch 'tor-github/pr/1136'
2019-07-02 13:33:50 -04:00
cf92c096ad
Merge remote-tracking branch 'tor-github/pr/1120'
2019-07-02 13:33:37 -04:00
59e523f058
Early exit from post-merge git hook script when not merging to master
2019-07-02 20:06:23 +03:00
15e28af2d1
Merge remote-tracking branch 'dgoulet/ticket31008_035_01'
2019-07-02 13:19:40 +03:00
c0ea6f9c64
Merge branch 'maint-0.4.1'
2019-07-01 14:25:13 -04:00
5e16601000
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-07-01 14:25:12 -04:00
2a42d6be27
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-07-01 14:25:12 -04:00
1dd9527897
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-07-01 14:25:12 -04:00
7541aaf988
Merge branch 'chutney_ci_v4_040' into chutney_ci_v4_041
2019-07-01 14:36:53 +10:00
7b05f19801
Merge branch 'chutney_ci_v4_035' into chutney_ci_v4_040
...
This merge removes an incorrect comment about the stem version
and commit script.
2019-07-01 14:36:15 +10:00
6bc8dedbed
Travis: SKIP_MAKE_CHECK="yes" when running stem
...
And add some comments about stem
Part of 29280.
2019-07-01 14:33:54 +10:00
84f2c0affb
Merge branch 'chutney_ci_v4_029' into chutney_ci_v4_035
2019-07-01 14:33:37 +10:00
75f9ae9029
Travis: remove a redundant os: linux line
...
Linux is the first item in the os matrix, so we don't need to specify
it under matrix: include: .
Part of 29280.
2019-07-01 14:25:37 +10:00
ac7ce17983
Travis: show the chutney commit and python version
...
Part of 29280.
2019-07-01 14:25:33 +10:00
b26e3e4c56
Travis: show chutney logs on chutney job failure
...
Part of 29280.
2019-07-01 14:05:26 +10:00
a5911c4551
get rid of accidental second space
2019-06-29 22:26:00 -04:00
f55598f870
Coverity: different implementation for csiphash
...
Coverity has had trouble figuring out our csiphash implementation,
and has given spurious warnings about its behavior.
This patch changes the csiphash implementation when coverity is in
use, so that coverity can figure out that we are not about to read
beyond the provided input.
Closes ticket 31025.
2019-06-28 12:07:38 -04:00
0fa3dc3228
begin_cell_parse(): Add an assertion to please coverity.
...
Coverity doesn't understand that if begin_cell_parse() returns 0 and
sets is_begindir to 0, its address field will always be set.
Fixes bug 30126; bugfix on 0.2.4.7-alpha; Fixes CID 1447296.
2019-06-28 11:29:51 -04:00
fb977f8cac
changes: file for 28795
...
Replace the 157 fallbacks originally introduced in Tor 0.3.5.6-rc
in December 2018 (of which ~122 were still functional), with a
list of 148 fallbacks (70 new, 78 existing, 79 removed) generated
in June 2019.
Closes ticket 28795.
Note that we created extra lists from DE and US, but they didn't add
any more fallbacks when we tried to merge them.
2019-06-28 21:38:33 +10:00
f3b2a81ce7
fallback: apply the second fallback list from 2019
...
Update the fallback directory mirrors by merging the current list with:
fallback_dirs_2019-06-28-08-58-39_AU_f0437a39ddbc8459.inc
Part of 28795, see that ticket for logs.
2019-06-28 21:16:50 +10:00
37c2808ab0
fallback: apply the first fallback list from 2019
...
Update the fallback directory mirrors by replacing the old list with:
fallback_dirs_2019-06-25-11-49-10_AU_a37adb956fbb5cd2.inc
Part of 28795, see that ticket for logs.
2019-06-28 21:05:00 +10:00
f446db59e1
man: Fix -help typo to --help
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-06-27 14:52:12 -04:00
c34a6b922f
Merge branch 'tor-github/pr/1129'
2019-06-27 10:19:45 -04:00
362afa8c4e
doc: update the man page entries for DirAuthority and FallbackDir
...
Improve the documentation for the DirAuthority and FallbackDir torrc
options.
Closes ticket 30955.
2019-06-27 10:19:40 -04:00
6afe1b00c9
Merge branch 'tor-github/pr/1140'
2019-06-26 11:39:33 -04:00
da11304136
Merge branch 'maint-0.4.1'
2019-06-26 10:06:02 -04:00
3ccf91027b
Merge remote-tracking branch 'tor-github/pr/1101' into maint-0.4.1
2019-06-26 10:05:51 -04:00
089ef46063
Merge branch 'bug30721_squashed'
2019-06-26 09:57:20 -04:00
6ef555bda0
test/addr: test that tor_addr_port_lookup() handles IP addresses and ports
...
And that it does something sensible with host and host:port.
Also reorder the tests into valid, invalid, and ambiguous.
And add some missing cases.
Note: tor_addr_port_lookup() handles ip, ip:port, host, and host:port.
Tests for 30721.
2019-06-26 09:55:37 -04:00
George Kadianakis
Nick Mathewson
David Goulet
pulls
Roger Dingledine
rl1987
teor