summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-02-15Merge branch 'maint-0.3.3'Nick Mathewson
2018-02-15Merge remote-tracking branch 'dgoulet/ticket24343_033_01' into maint-0.3.3Nick Mathewson
2018-02-15Merge remote-tracking branch 'ffmancera-1/bug18918'Nick Mathewson
2018-02-15Merge branch 'bug23909'Nick Mathewson
2018-02-15Merge branch 'bug24914'Nick Mathewson
2018-02-15Fix a stack-protector warning: don't use a variable-length bufferNick Mathewson
Instead, define a maximum size, and enforce it with an assertion.
2018-02-15Merge branch 'onion_ntor_malloc_less'Nick Mathewson
2018-02-15Documentation fixes suggested by catalyst.Nick Mathewson
2018-02-15Merge remote-tracking branch 'isis/bug25185'Nick Mathewson
2018-02-15Merge branch 'maint-0.3.3'Nick Mathewson
2018-02-15Merge remote-tracking branch 'isis/bug25171' into maint-0.3.3Nick Mathewson
2018-02-15Merge branch '25162_zstd_static'Nick Mathewson
2018-02-15This stats_n_seconds_working variable needs to be static now.Nick Mathewson
(When a variable isn't going to be declared extern in the header, we require that it be static.)
2018-02-15Merge remote-tracking branch 'valentecaio/t-25081'Nick Mathewson
2018-02-15Merge remote-tracking branch 'valentecaio/t-24714'Nick Mathewson
2018-02-16tests: Remove duplicate included header file in src/test/test.c.Isis Lovecruft
* FIXES #25271: https://bugs.torproject.org/25271
2018-02-15Merge branch 'bug18105'Nick Mathewson
2018-02-15Merge branch 'bug24484_squashed'Nick Mathewson
2018-02-15Remove workaround code for systems where free(NULL) is busted.Nick Mathewson
Add an autoconf test to make sure we won't regret it. Closes ticket 24484.
2018-02-15Bump version in master to 0.3.4.0-alpha-devtor-0.3.4.0-alpha-devNick Mathewson
2018-02-15Merge branch 'protover_rust_compat_v3'Nick Mathewson
2018-02-15rust protover: match the C implementation on empty-str casesNick Mathewson
Empty versions lists are permitted; empty keywords are not.
2018-02-15Forbid u32::MAX as a protover range element in rustNick Mathewson
Part of the 25249 fix to make rust match the C.
2018-02-15Rust protover compat: forbid more than MAX_VERSIONS_TO_EXPAND in a rangeNick Mathewson
Also correct MAX_VERSIONS_TO_EXPAND to match the C. NOTE that this patch leads to incorrect behavior: the C code allows huge ranges; it just doesn't allow votes on them (currently). For full compatibility, we'll need to make the rust code store ranges as ranges natively, possibly using something like the range_map crate. Still, this patch is smaller than a "proper" fix. Fixes TROVE-2018-003.
2018-02-14Merge remote-tracking branch 'mikeperry/bug24769'Nick Mathewson
2018-02-13Merge branch 'tests_rust'Nick Mathewson
2018-02-13Merge branch 'maint-0.3.2'Nick Mathewson
2018-02-13Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-13Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-02-13fix make check-changesTaylor Yu
2018-02-13Merge remote-tracking branch 'dgoulet/ticket24902_029_05'Nick Mathewson
2018-02-13Make check-changes happyDavid Goulet
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-13man: Document default values if not in the consensus for DoS mitigationDavid Goulet
Fixes #25236 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-13Merge remote-tracking branch 'dgoulet/bug25223_029_01' into ticket24902_029_05David Goulet
2018-02-13dos: Add extra safety asserts in cc_stats_refill_bucket()David Goulet
Never allow the function to set a bucket value above the allowed circuit burst. Closes #25202 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-13dos: Don't set consensus param if we aren't a public relayDavid Goulet
We had this safeguard around dos_init() but not when the consensus changes which can modify consensus parameters and possibly enable the DoS mitigation even if tor wasn't a public relay. Fixes #25223 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-13Remove 25170 changes file from master: it was already merged in 0.3.3.2-alphaNick Mathewson
2018-02-13Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-13Merge branch 'maint-0.3.2'Nick Mathewson
2018-02-13Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-02-13dirserv: Improve returned message when relay is rejectedDavid Goulet
Explicitly inform the operator of the rejected relay to set a valid email address in the ContactInfo field and contact bad-relays@ mailing list. Fixes #25170 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-13Merge remote-tracking branch 'dgoulet/ticket24902_029_05'Nick Mathewson
2018-02-12Have tor_addr hashes return a randomized hash for AF_UNSPEC.Nick Mathewson
We don't expect this to come up very much, but we may as well make sure that the value isn't predictable (as we do for the other addresses) in case the issue ever comes up. Spotted by teor.
2018-02-12Fix a typo in an address_set.c comment.Nick Mathewson
2018-02-12Merge branch 'maint-0.3.2'Nick Mathewson
2018-02-12Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-12Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-02-12Merge branch 'bug23318-redux_029' into maint-0.2.9Nick Mathewson
2018-02-12Tweaks into router_should_be_dirserver() log msg.Fernando Fernandez Mancera
Fixed log message that has been changed in commit 5ea993fa5a. Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
2018-02-11Merge branch 'maint-0.3.2'Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion