Nick Mathewson
1c7121be54
Merge branch 'bug24119_squashed'
2017-11-30 08:00:34 -05:00
Alex Xu (Hello71)
49a4961dad
Add changes/bug24119
2017-11-30 08:00:24 -05:00
Alex Xu (Hello71)
f1e8e54964
Simplify channel_rsa_id_group_set_badness, #24119
2017-11-30 08:00:24 -05:00
Fernando Fernandez Mancera
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
Nick Mathewson
27f017639f
Merge branch 'ticket20020'
2017-11-29 20:24:34 -05:00
Nick Mathewson
20fa6a3883
Merge branch 'maint-0.3.2'
2017-11-29 12:06:14 -05:00
Nick Mathewson
f0007f2b8d
Merge branch 'bug24050_029_squashed' into maint-0.3.2
2017-11-29 12:05:49 -05:00
Nick Mathewson
eb1976202e
Fix unit tests for 24050.
2017-11-29 12:05:36 -05:00
Nick Mathewson
6a9c3d6e3a
Merge branch 'maint-0.3.2'
2017-11-29 12:02:44 -05:00
Nick Mathewson
9b44bb49b4
Merge branch 'bug24050_029_squashed' into maint-0.3.2
2017-11-29 12:02:07 -05:00
Nick Mathewson
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
Nick Mathewson
b230860608
Merge branch 'maint-0.3.2'
2017-11-27 10:04:16 -05:00
Nick Mathewson
ef54610442
Merge branch 'ticket23856_025_01' into maint-0.3.2
2017-11-27 10:02:03 -05:00
David Goulet
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
Nick Mathewson
722c64fc23
Merge branch 'maint-0.3.2'
2017-11-27 09:09:34 -05:00
Nick Mathewson
4bb287aa39
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-11-27 09:09:34 -05:00
Nick Mathewson
703ab95e9f
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-11-27 09:09:34 -05:00
Nick Mathewson
b1c4ab0bec
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-11-27 09:09:34 -05:00
Nick Mathewson
30b3229252
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-11-27 09:09:34 -05:00
Sebastian Hahn
25c90230be
Add bastet's ipv6 address
...
Implements ticket 24394
2017-11-27 09:09:16 -05:00
Alex Xu (Hello71)
2cda005ac4
Add fast paths to channel_rsa_id_group_set_badness, #24119
2017-11-24 12:42:51 -05:00
Nick Mathewson
c2f413e245
Merge branch 'maint-0.3.2'
...
"ours" merge to avoid version bump.
2017-11-22 08:34:33 -05:00
Nick Mathewson
a7e777ab8e
bump to 0.3.2.5-alpha-dev
2017-11-22 08:34:02 -05:00
Nick Mathewson
80dbe06ce8
forwardport a changelog
2017-11-22 08:27:35 -05:00
Nick Mathewson
ce793ec0a9
Merge remote-tracking branch 'ahf-gitlab/ahf/24062-simpleperf'
2017-11-21 14:09:56 -05:00
Nick Mathewson
bf882b0373
re-run ./scripts/maint/annotate_ifdef_directives
2017-11-21 14:07:43 -05:00
Nick Mathewson
5da0a73838
Merge branch 'ticket23953_033_squashed'
2017-11-21 14:06:57 -05:00
Nick Mathewson
25f882a9cf
Use stdatomic.h for atomic_counter_t where available.
...
Closes ticket 23953.
2017-11-21 14:06:48 -05:00
Nick Mathewson
8b3580255d
Merge remote-tracking branch 'teor/bug24372'
2017-11-21 13:57:48 -05:00
Nick Mathewson
1cc344b277
Merge remote-tracking branch 'teor/bug23760_nc'
2017-11-21 13:56:57 -05:00
Nick Mathewson
add37440fa
changes file for 24318
2017-11-21 13:55:11 -05:00
Fernando Fernandez Mancera
5f4e9d5079
Clarify the RelayBandwidth* options in man file
...
Added clarifying information in man file about RelayBandwidthRate and
RelayBandwidthBurst options that exclude directory fetches by relays.
Fixes #24318
Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
2017-11-21 13:54:16 -05:00
Fernando Fernandez Mancera
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
Nick Mathewson
a2038b8d9e
Merge branch 'maint-0.3.2'
...
"ours" merge to avoid version bump.
2017-11-21 12:54:26 -05:00
Nick Mathewson
5da6120e88
bump version to 0.3.2.5-alpha
2017-11-21 12:54:11 -05:00
Nick Mathewson
517032b8ce
Merge branch 'maint-0.3.2'
2017-11-21 12:41:39 -05:00
Nick Mathewson
ba94dc28e8
Merge branches 'bug24099_031' and 'bug24086_031' into maint-0.3.2
2017-11-21 12:37:46 -05:00
Nick Mathewson
ea13a47791
add an explanatory comment about the error codes
2017-11-21 12:36:32 -05:00
teor
03b18f6288
Fix a confusing comment about tie-breaking in compute_routerstatus_consensus()
...
Closes bug 24372.
2017-11-22 02:27:28 +11:00
Neel Chauhan
83b8034a98
Introduce node_get_curve25519_onion_key() in extend_info_from_node()
2017-11-22 02:20:54 +11:00
Nick Mathewson
b1ab360eca
Merge branch 'maint-0.3.2'
2017-11-20 14:35:26 -05:00
Nick Mathewson
da82e0b579
Merge branch 'bug23817_031' into maint-0.3.2
2017-11-20 14:29:50 -05:00
George Kadianakis
69f93f806c
Check number of usable guards when applying md restrictions.
...
We used to check whether we have enough filtered guards (guard set when
torrc is applied) but that's not good enough, since that might be bad in
some cases where many guards are not reachable (might cause overblocking
and hence reacahbility issues).
We now check if we have enough reachable filtered guards before applying
md restrictions which should prevent overblocking.
2017-11-20 14:28:56 -05:00
Nick Mathewson
9068e55ce8
Merge branch 'maint-0.3.2'
2017-11-20 14:25:17 -05:00
Nick Mathewson
e2d8300c10
Merge branch 'bug23783' into maint-0.3.2
2017-11-20 14:25:12 -05:00
Nick Mathewson
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
Nick Mathewson
729f9a286c
Merge branch 'maint-0.3.2'
2017-11-20 13:22:10 -05:00
Nick Mathewson
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
Alexander Færøy
251983eb8e
Add initial instructions on using Simpleperf for Android CPU profiling.
...
See: https://bugs.torproject.org/24062
2017-11-20 17:42:51 +01:00
Nick Mathewson
68c21860e3
Add another assertion to check for 24086 root causes
...
In cdm_diff_ht_set_status(), we shouldn't have been allowing the
status CDM_DIFF_PRESENT to be set if there wasn't actually a handle.
2017-11-20 11:06:31 -05:00
