bef461ef1f
Switch -Wnormalized=id to -Wnormalized=nfkc
...
Modified -Wnormalized flag to nfkc option in configure.ac to avoid source code
identifier confusion.
Fixes #24467
Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com >
2017-11-29 20:29:55 -05:00
27f017639f
Merge branch 'ticket20020'
2017-11-29 20:24:34 -05:00
6a9c3d6e3a
Merge branch 'maint-0.3.2'
2017-11-29 12:02:44 -05:00
9b44bb49b4
Merge branch 'bug24050_029_squashed' into maint-0.3.2
2017-11-29 12:02:07 -05:00
a94c486102
Make the cache_ipv4_answers default become 0 again, for real.
...
Fortunately, use_cached_ipv4_answers was already 0, so we wouldn't
actually use this info, but it's best not to have it.
Fixes bug 24050; bugfix on 0.2.6.3-alpha
2017-11-29 12:01:45 -05:00
b230860608
Merge branch 'maint-0.3.2'
2017-11-27 10:04:16 -05:00
ef54610442
Merge branch 'ticket23856_025_01' into maint-0.3.2
2017-11-27 10:02:03 -05:00
8be50ca3ea
relay: Change bandwidth stats interval to 24 hours
...
Going from 4 hours to 24 hours in order to try reduce the efficiency of guard
discovery attacks.
Closes #23856
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-11-27 10:00:40 -05:00
722c64fc23
Merge branch 'maint-0.3.2'
2017-11-27 09:09:34 -05:00
4bb287aa39
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-27 09:09:34 -05:00
703ab95e9f
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-27 09:09:34 -05:00
b1c4ab0bec
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-27 09:09:34 -05:00
30b3229252
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-27 09:09:34 -05:00
25c90230be
Add bastet's ipv6 address
...
Implements ticket 24394
2017-11-27 09:09:16 -05:00
5da0a73838
Merge branch 'ticket23953_033_squashed'
2017-11-21 14:06:57 -05:00
25f882a9cf
Use stdatomic.h for atomic_counter_t where available.
...
Closes ticket 23953.
2017-11-21 14:06:48 -05:00
1cc344b277
Merge remote-tracking branch 'teor/bug23760_nc'
2017-11-21 13:56:57 -05:00
add37440fa
changes file for 24318
2017-11-21 13:55:11 -05:00
edc3fe0eb5
Remove /usr/athena from search path in configure.ac
...
Fixes #24363
Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com >
2017-11-21 13:53:26 -05:00
517032b8ce
Merge branch 'maint-0.3.2'
2017-11-21 12:41:39 -05:00
ba94dc28e8
Merge branches 'bug24099_031' and 'bug24086_031' into maint-0.3.2
2017-11-21 12:37:46 -05:00
83b8034a98
Introduce node_get_curve25519_onion_key() in extend_info_from_node()
2017-11-22 02:20:54 +11:00
9068e55ce8
Merge branch 'maint-0.3.2'
2017-11-20 14:25:17 -05:00
1bf36c1837
Include ws2_32 when trying to link openssl on windows in autoconf
...
Fixes bug 23783; bugfix on 0.3.2.2-alpha when we started looking for
TLSv1_1_method().
2017-11-20 13:37:22 -05:00
729f9a286c
Merge branch 'maint-0.3.2'
2017-11-20 13:22:10 -05:00
846df5b3cd
Merge remote-tracking branches 'public/ticket24315_029' and 'public/bug24198_029' into maint-0.3.2
2017-11-20 13:20:25 -05:00
3bb29dd707
Correctly handle partial success in consensus diff calculation.
...
Previously, if store_multiple() reported a partial success, we would
store all the handles it gave us as if they had succeeded. But it's
possible for the diff to be only partially successful -- for
example, if LZMA failed but the other compressors succeeded.
Fixes bug 24086; bugfix on 0.3.1.1-alpha.
2017-11-20 11:04:37 -05:00
c8ee12b2e8
Recover better from empty/invalid storagedir files
...
If we can't read a file because of an FS issue, we say "we can't
read that" and move on. But if we can't read it because it's empty,
because it has no labels, or because its labels are misformatted, we
should remove it.
Fixes bug 24099; bugfix on 0.3.1.1-alpha.
2017-11-20 10:14:41 -05:00
04812e59df
Merge branch 'maint-0.3.2'
2017-11-20 08:39:39 -05:00
e0f7a2dbd4
Merge branch 'bug23681_029_01_squashed' into maint-0.3.2
2017-11-20 08:39:34 -05:00
981bb60575
circuit: Don't timeout opened C_INTRODUCING circuit
...
A circuit with purpose C_INTRODUCING means that its state is opened but the
INTRODUCE1 cell hasn't been sent yet. We shouldn't consider that circuit when
looking for timing out "building circuit". We have to wait on the rendezvous
circuit to be opened before sending that cell so the intro circuit needs to be
kept alive for at least that period of time.
This patch makes that the purpose C_INTRODUCING is ignored in the
circuit_expire_building() which means that we let the circuit idle timeout
take care of it if we end up never using it.
Fixes #23681
Signed-off-by: David Goulet <dgoulet@torproject.org >
2017-11-20 08:33:44 -05:00
2e590bac97
Remove changes files that have already been merged in 0.3.2.x
2017-11-18 11:23:41 -05:00
7358559524
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-18 11:02:42 -05:00
2d849716df
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-18 11:02:08 -05:00
53c3174ee4
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-18 11:01:43 -05:00
d388f9d879
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-18 11:01:33 -05:00
b9bce4288e
Merge branch 'maint-0.3.2'
2017-11-18 10:23:52 -05:00
a5b8b55c1c
Fix memory leak in unit test for bridge distribution config.
...
Also, check for the actual message, and fix some string confusion,
while we're at it.
Fixes bug 24345; bugfix on 0.3.2.3-alpha.
2017-11-18 10:22:14 -05:00
fcdec00685
Merge branch 'maint-0.3.2'
2017-11-17 09:59:26 -05:00
2cee26b164
Merge branch 'bug23817_031' into maint-0.3.2
2017-11-17 09:56:53 -05:00
f61e3090fb
Introduce new guard restriction and use it to skip outdated dirs.
2017-11-17 09:52:40 -05:00
94dce246ee
Merge branch 'maint-0.3.2'
2017-11-17 09:26:11 -05:00
b98614f1af
Only log about lost KIST support once
2017-11-17 09:25:47 -05:00
8b2c01a46f
Use less jargon in Scheduler sec. of man page
2017-11-17 09:25:07 -05:00
3537f7801d
Add notes about OS support for our scheduler types
2017-11-17 09:25:01 -05:00
cfacd44240
Merge branch 'maint-0.3.2'
2017-11-17 09:23:07 -05:00
85778dc92d
Merge remote-tracking branch 'dgoulet/bug23861_032_01' into maint-0.3.2
2017-11-17 09:23:04 -05:00
368dc1003e
Merge branch 'maint-0.3.2'
2017-11-17 08:35:56 -05:00
3a364309ac
Merge branch 'bug24167_025' into maint-0.3.2
2017-11-17 08:35:52 -05:00
4ef70ff389
Merge branch 'maint-0.3.2'
2017-11-17 08:35:04 -05:00
Fernando Fernandez Mancera
Nick Mathewson
David Goulet
Sebastian Hahn
Neel Chauhan
George Kadianakis
Matt Traudt