Nick Mathewson
8eef7fc845
Merge branch 'maint-0.3.1'
2017-09-12 10:30:54 -04:00
Nick Mathewson
befddf6d2a
Merge branch 'ticket17857_squashed' into maint-0.3.1
2017-09-12 10:29:00 -04:00
Mike Perry
6689c95d06
Changes file for #17857 .
2017-09-12 10:28:45 -04:00
Mike Perry
6d221c8f37
Ticket #17857 : Apply padding off-switch to existing connections.
2017-09-12 10:28:45 -04:00
Nick Mathewson
5238210da4
changes file for 22215
2017-09-12 09:58:07 -04:00
Nick Mathewson
035fe2d208
Remove named_map and unnamed_map from networkstatus.c
2017-09-12 09:56:42 -04:00
Neel Chauhan
42b5e3cbb7
Remove networkstatus_nickname_is_unnamed()
2017-09-12 09:52:07 -04:00
Nick Mathewson
4ace1b96ac
Add a changes file for 22437.
2017-09-12 09:31:57 -04:00
Nick Mathewson
2bfc490c1e
Merge remote-tracking branch 'teor/ticket22437'
2017-09-12 09:30:33 -04:00
Nick Mathewson
80a22f536a
Merge branch 'bug23479'
2017-09-12 09:24:54 -04:00
Nick Mathewson
767372f6a0
Merge branch 'maint-0.3.1'
2017-09-12 09:24:34 -04:00
Nick Mathewson
469189d84a
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid torgzip.c change, since torgzip has been replaced.
2017-09-12 09:24:20 -04:00
Nick Mathewson
0729ba2868
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-12 09:23:57 -04:00
Nick Mathewson
bac160b4e0
One more implicit fallthrough warning to fix on GCC 7
2017-09-12 09:22:50 -04:00
Nick Mathewson
5bb4e0c88d
Whoops -- options_trial_assign() was calling get_options() in #22281
...
So, move the get_options() call.
2017-09-12 08:40:13 -04:00
teor
d7d8d2c20e
Add v3 hidden service support to make test-network-all
...
Requires chutney master 50f64ea or later.
Implements ticket 22437.
2017-09-12 17:08:28 +10:00
Nick Mathewson
6e4967ef03
Merge remote-tracking branch 'dgoulet/ticket23462_032_01'
2017-09-11 17:57:31 -04:00
Nick Mathewson
eaa8224cef
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-11 17:49:18 -04:00
Nick Mathewson
2b26815e09
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-11 17:49:18 -04:00
Nick Mathewson
e3caad0ea1
Merge branch 'maint-0.3.1'
2017-09-11 17:49:18 -04:00
Andreas Stieger
6cd5a80275
Fix GCC 7 -Wimplicit-fallthrough warnings
...
Add magic comments recognized by default -Wimplicit-fallthrough=3
or break, as required.
2017-09-11 17:47:04 -04:00
Andreas Stieger
b81a2e8f46
Fix GCC 7 -Wimplicit-fallthrough warnings (32 bit)
...
Add magic comments recognized by default -Wimplicit-fallthrough=3
Follow-up to e5f464, fixes Ticket 22446 for 32 bit.
[nick notes: Backport from 0.3.1.3-alpha.]
2017-09-11 17:45:07 -04:00
Nick Mathewson
b719fa7efe
downgrade warning for #23465
2017-09-11 16:50:43 -04:00
Nick Mathewson
c5a5597572
spelling
2017-09-11 16:48:27 -04:00
Nick Mathewson
2a1ddd78da
Merge remote-tracking branch 'dgoulet/bug23455_032_01'
2017-09-11 16:32:40 -04:00
Nick Mathewson
d4f87073ae
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-11 16:29:10 -04:00
Nick Mathewson
c894e9d3d4
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-11 16:29:10 -04:00
Nick Mathewson
007d3d2337
Merge branch 'maint-0.3.1'
2017-09-11 16:29:10 -04:00
Nick Mathewson
6a49e3360b
Fix mixed-sign comparison warning in fix for 22797.
2017-09-11 16:29:06 -04:00
Nick Mathewson
a25d97e530
Merge branch 'teor-bug22797-025' into maint-0.2.9
2017-09-11 16:28:59 -04:00
Nick Mathewson
b9ecb522fc
Merge branch 'ticket22281_squashed'
2017-09-11 16:23:24 -04:00
Nick Mathewson
c4cb969a2a
Taboo the get_options() function while options are validating
...
When option validation or transition is happening, there are no
"current options" -- only "old options" and "maybe new options".
Looking at get_options() is likely a mistake, so have a nonfatal
assertion let us know if we do that.
Closes 22281.
2017-09-11 16:23:16 -04:00
Nick Mathewson
fca590a63f
Merge branch 'ticket23304_032_01_squashed'
2017-09-11 16:13:55 -04:00
David Goulet
00967cd2a8
prop224: Log undecodable descriptor when SafeLogging is off
...
Closes #23304
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-11 16:13:46 -04:00
David Goulet
84bb5cb1f1
circuit: Add a log info when marking for close
...
Closes #23462
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-11 16:10:18 -04:00
David Goulet
59072d2027
test: Fix memleaks
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-11 14:39:24 -04:00
Nick Mathewson
52c40330c8
Merge branch 'maint-0.3.1'
2017-09-11 13:49:20 -04:00
Nick Mathewson
72ea4a8f08
Extract the important parts of the run-pending-timers function.
...
Our unit tests will need this, so that they can simulate advancing
time without getting libevent involved.
2017-09-11 13:48:39 -04:00
David Goulet
b71f4ecb8d
hs: Handled REND_JOINED circuit when getting an INTRODUCE_ACK
...
Because we can get a RENDEZVOUS2 cell before the INTRODUCE_ACK, we need to
correctly handle the circuit purpose REND_JOINED that is not change its
purpose when we get an INTRODUCE_ACK and simply close the intro circuit
normally.
Fixes #23455
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-11 13:38:58 -04:00
Nick Mathewson
67a5d4cb60
Merge remote-tracking branch 'catalyst-oniongit/ticket23368'
2017-09-08 15:11:07 -04:00
Taylor Yu
55fef0534d
Add guidelines for floating point use
2017-09-08 12:15:41 -05:00
Nick Mathewson
2df7f1d59d
Merge branch 'ed25519_lookup'
2017-09-08 12:18:22 -04:00
Nick Mathewson
ca19a95d54
Merge remote-tracking branch 'dgoulet/ticket23355_032_01'
2017-09-08 12:13:48 -04:00
Nick Mathewson
2264172fb3
Merge remote-tracking branch 'asn/bug23387_squashed'
2017-09-08 12:09:02 -04:00
George Kadianakis
0307e7e0e7
test: Test that client picks the right HSDir for service.
...
This test is important because it tests that upload_descriptor_to_all()
is in synch with pick_hsdir_v3(). That's not the case for the
reachability test which just compares the responsible hsdir sets.
2017-09-08 19:07:00 +03:00
George Kadianakis
e0371935a1
prop224: Pick the right hsdir index based on descriptor.
...
There was a bug in upload_descriptor_to_all() where we picked between
first and second hsdir index based on which time segment we are. That's
not right and instead we should be uploading our two descriptors using a
different hsdir index every time. That is, upload first descriptor using
first hsdir index, and upload second descriptor using second hdsir index.
Also simplify stuff in pick_hdsir_v3() since that's only used to fetch
descriptors and hence we can just always use the fetch hsdir index.
2017-09-08 19:07:00 +03:00
George Kadianakis
e7bdb9eedc
prop224: hs_time_between_tp_and_srv() -> hs_in_period_between_tp_and_srv()
...
Conflicts:
src/or/nodelist.c
2017-09-08 19:07:00 +03:00
George Kadianakis
eb81a8e69c
prop224: 'is_new_tp' -> 'use_second_hdsir_index' in hs_get_responsible_hsdirs()
2017-09-08 19:07:00 +03:00
David Goulet
6c6ba07517
test: Improve our rotation and build descriptor tests
...
Because of the latest changes on when we rotate, longer lifetime of
descriptors and no more overlap period, the tests needed to be improved to
test more functionnalities.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-08 19:07:00 +03:00
David Goulet
f2c93f9943
test: Fix use out of scope and consensus timings
...
First, this fixes #23372 .
Second, the consensus timings for the build descriptor have been changed to
the current test can pass. More extensive tests of descriptor rotation are
coming in a commit near you because the rotation and time period logic has
been changed.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-08 19:07:00 +03:00
