George Kadianakis
78a8827fd4
Silence unneeded clang warns that triggered in prob distr tests.
...
See https://trac.torproject.org/projects/tor/ticket/29528#comment:3
and https://bugs.llvm.org/show_bug.cgi?id=19535
2019-03-20 18:02:54 +10:00
teor
3871fb732d
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-20 09:48:12 +10:00
teor
41cd05562f
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-20 09:48:03 +10:00
teor
d7a5fdcb74
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-03-20 09:47:55 +10:00
teor
6bf9078ceb
Merge remote-tracking branch 'tor-github/pr/798' into maint-0.3.5
2019-03-20 09:47:31 +10:00
teor
db2ac3b9fe
Merge remote-tracking branch 'tor-github/pr/774' into maint-0.2.9
2019-03-20 09:46:10 +10:00
Nick Mathewson
de5ab1ef49
Merge remote-tracking branch 'tor-github/pr/802' into maint-0.4.0
2019-03-19 09:32:05 -04:00
teor
b4483edce0
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-19 15:43:33 +10:00
teor
17e3eea685
Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5
2019-03-19 15:43:05 +10:00
teor
af21d126e6
Merge branch 'bug29706_035_minimal_merge' into bug29706_040_minimal_merge
...
Comment merge.
2019-03-18 11:30:37 +10:00
teor
55865a2c9c
Merge branch 'bug29706_034_minimal_merge' into bug29706_035_minimal_merge
2019-03-18 11:29:20 +10:00
teor
aec6ee201b
test/sr: update sr_state_free() to sr_state_free_all() in a comment
2019-03-18 11:28:34 +10:00
teor
1d0146e2a2
Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge
2019-03-18 11:27:59 +10:00
teor
c44ad396f8
test/sr: Clear SRVs after init, and before setup
...
Already merged to 0.4.0 and later in tor-github/pr/776.
Backported to 0.2.9 and later with minor comment changes.
Part of 29706.
2019-03-18 11:12:25 +10:00
Nick Mathewson
1547fd99a6
Merge branch 'bug28656_035_squashed' into maint-0.4.0
2019-03-15 08:59:19 -04:00
teor
532f4c9103
Stop logging a BUG() warning when tor is waiting for exit descriptors
...
Fixes bug 28656; bugfix on 0.3.5.1-alpha.
2019-03-15 08:57:28 -04:00
Nick Mathewson
560ba98dd7
Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0
2019-03-15 08:54:30 -04:00
Nick Mathewson
94523bffdc
Merge remote-tracking branch 'tor-github/pr/791' into maint-0.4.0
2019-03-15 08:52:50 -04:00
Roger Dingledine
a3bc950e42
relays shouldn't close idle rend circuits
...
Allow connections to single onion services to remain idle without being
disconnected.
Relays acting as rendezvous points for single onion services were
mistakenly closing idle established rendezvous circuits after 60 seconds,
thinking that they are unused directory-fetching circuits that had served
their purpose.
Fixes bug 29665; bugfix on 0.2.1.26.
2019-03-14 12:54:16 +02:00
Roger Dingledine
add0f89c14
relays shouldn't close idle rend circuits
...
Allow connections to single onion services to remain idle without being
disconnected.
Relays acting as rendezvous points for single onion services were
mistakenly closing idle established rendezvous circuits after 60 seconds,
thinking that they are unused directory-fetching circuits that had served
their purpose.
Fixes bug 29665; bugfix on 0.2.1.26.
2019-03-14 12:53:33 +02:00
teor
feb7253df3
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-14 07:00:43 +10:00
teor
5d41e2223f
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" merge to ignore the changes to src/common/compat.c,
they have already been merged to 0.3.5 in the correct file.
2019-03-14 06:59:09 +10:00
teor
e021f89f36
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-03-14 06:56:38 +10:00
teor
f3b17a6b26
Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4
2019-03-14 06:56:09 +10:00
teor
c03b1b3f08
Merge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4
2019-03-14 06:55:57 +10:00
teor
66f944f79b
Merge branch 'bug28096-029-squashed' into bug28096-034-squashed
...
Merge the new code, and preserve the #else macro comment from 0.3.4.
2019-03-14 06:53:17 +10:00
teor
2840580cf2
Merge remote-tracking branch 'nickm/bug27073_029' into bug27073_034
...
Replace == with OP_EQ in test macros.
2019-03-14 06:47:32 +10:00
teor
5606cfae47
Merge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4
2019-03-14 06:41:14 +10:00
teor
8bd9b2a6a0
Merge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9
2019-03-14 06:37:50 +10:00
teor
90301247fd
Merge remote-tracking branch 'tor-github/pr/765' into maint-0.2.9
2019-03-14 06:37:17 +10:00
teor
530304dd77
Merge remote-tracking branch 'tor-github/pr/746' into maint-0.2.9
2019-03-14 06:36:47 +10:00
teor
eaa84234c9
Merge remote-tracking branch 'tor-github/pr/510' into maint-0.2.9
2019-03-14 06:36:11 +10:00
teor
9daae1b302
Merge remote-tracking branch 'tor-github/pr/331' into maint-0.2.9
2019-03-14 06:35:05 +10:00
teor
a9c3101e21
test/sr: Clear SRVs after init, and before setup
...
Part of 29706.
2019-03-13 15:29:46 +10:00
George Kadianakis
ec2a2a6b7a
Fix #28525 changes file that is breaking CI.
2019-03-12 20:11:51 +02:00
George Kadianakis
0ce32affc2
Merge branch 'tor-github/pr/763' into maint-0.4.0
2019-03-12 18:11:35 +02:00
Nick Mathewson
9c9214f2c9
Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0
2019-03-12 11:03:37 -04:00
teor
dfc3e552a3
test/sr: update sr_state_free() to sr_state_free_all()
...
The function name changed between 0.2.9 and 0.3.4.
2019-03-12 11:34:52 +10:00
teor
c7854933e9
Merge branch bug29706_029_refactor into bug29706_034_refactor
2019-03-12 11:31:52 +10:00
teor
9eeff921ae
sr: BUG() on NULL sr_state before doing a state_query_*()
...
Part of #29706 .
2019-03-12 11:14:30 +10:00
teor
0cca554110
sr: Check for replacing a SRV pointer with the same pointer
...
Check if the new pointer is the same as the old one: if it is, it's
probably a bug:
* the caller may have confused current and previous, or
* they may have forgotten to sr_srv_dup().
Putting NULL multiple times is allowed.
Part of 29706.
2019-03-12 11:14:30 +10:00
Nick Mathewson
a9c84bfd35
Merge remote-tracking branch 'tor-github/pr/756' into maint-0.4.0
2019-03-11 09:45:31 -04:00
teor
593fde930f
sr: rename srv_dup() to sr_srv_dup()
2019-03-09 12:03:12 +10:00
teor
26e6f56023
sr: Free SRVs before replacing them in state_query_put_()
...
Refactor the shared random state's memory management so that it actually
takes ownership of the shared random value pointers.
Fixes bug 29706; bugfix on 0.2.9.1-alpha.
2019-03-09 12:03:00 +10:00
teor
9400da9b5e
test/sr: Free SRVs before replacing them in test_sr_setup_srv()
...
Stop leaking parts of the shared random state in the shared-random unit
tests. The previous fix in 29599 was incomplete.
Fixes bug 29706; bugfix on 0.2.9.1-alpha.
2019-03-09 11:59:52 +10:00
Nick Mathewson
c40d53ab39
Merge branch 'pr_719_squashed_040' into maint-0.4.0
2019-03-08 10:25:43 -05:00
Mike Perry
ff410edec0
Bug 29204: Inspect circuit queues before sending padding.
...
Mitigates OOM conditions at relays.
2019-03-08 10:25:28 -05:00
David Goulet
b4e44a371f
hs-v2: Copy needed information between service on prunning
...
Turns out that when reloading a tor configured with hidden service(s), we
weren't copying all the needed information between the old service object to
the new one.
For instance, the desc_is_dirty timestamp wasn't which could lead to the
service uploading its descriptor much later than it would need to.
The replaycache wasn't also moved over and some intro point information as
well.
Fixes #23790
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-03-08 09:59:04 -05:00
teor
e91b999cf2
Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes
2019-03-08 19:37:18 +10:00
teor
968d2b87cb
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-08 14:11:46 +10:00
