summaryrefslogtreecommitdiff
path: root/src/or
AgeCommit message (Collapse)Author
2018-03-20Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-20Merge branch 'bug25306_032_01_squashed_v2' into maint-0.3.3Nick Mathewson
2018-03-20hs-v3: BUG() on missing descriptors during rotationDavid Goulet
Because of #25306 for which we are unable to reproduce nor understand how it is possible, this commit removes the asserts() and BUG() on the missing descriptors instead when rotating them. This allows us to log more data on error but also to let tor recover gracefully instead of dying. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-03-20Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-20Log information on specific compression backends in the OOM handler.Alexander Færøy
This patch adds some additional logging to circuits_handle_oom() to give us more information about which specific compression backend that is using a certain amount of memory. See: https://bugs.torproject.org/25372
2018-03-19Merge remote-tracking branch 'isis/bug23881_r1'Nick Mathewson
2018-03-19Use tor_asprintf for in have_enough_mem_for_dircache()Neel Chauhan
(Fixes bug 20887)
2018-03-19Merge remote-tracking branch 'fristonio/ticket-6236'Nick Mathewson
2018-03-19Merge branch 'ticket25268_034_01'Nick Mathewson
2018-03-14Merge remote-tracking branch 'public/restart_reset_bootstrap'Nick Mathewson
2018-03-13Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-13Update the documentation in tor_api.hNick Mathewson
2018-03-04Fix a crash bug when testing reachabilityNick Mathewson
Fixes bug 25415; bugfix on 0.3.3.2-alpha.
2018-03-03Merge remote-tracking branch 'fristonio/ticket4187'Nick Mathewson
2018-03-03Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-03Merge branch 'ticket23814' into maint-0.3.3Nick Mathewson
2018-03-01Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-01Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-03-01Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-03-01Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-03-01Spec conformance on protover: always reject ranges where lo>hiNick Mathewson
2018-03-01Forbid UINT32_MAX as a protocol versionNick Mathewson
The C code and the rust code had different separate integer overflow bugs here. That suggests that we're better off just forbidding this pathological case. Also, add tests for expected behavior on receiving a bad protocol list in a consensus. Fixes another part of 25249.
2018-03-01Forbid "-0" as a protocol version.Nick Mathewson
Fixes part of 24249; bugfix on 0.2.9.4-alpha.
2018-03-01Add another NULL-pointer fix for protover.c.Nick Mathewson
This one can only be exploited if you can generate a correctly signed consensus, so it's not as bad as 25074. Fixes bug 25251; also tracked as TROVE-2018-004.
2018-03-01Correctly handle NULL returns from parse_protocol_list when voting.Nick Mathewson
In some cases we had checked for it, but in others we had not. One of these cases could have been used to remotely cause denial-of-service against directory authorities while they attempted to vote. Fixes TROVE-2018-001.
2018-02-24Remove duplicate code between parse_{c,s}method in transport.cDeepesh Pathak
- Merged common code in function parse_{c,s}method to a single function - Removed duplicate code in transport.c - Fixes #6236
2018-02-20Remove a bunch of other redundant #includesNick Mathewson
Folks have found two in the past week or so; we may as well fix the others. Found with: \#!/usr/bin/python3 import re def findMulti(fname): includes = set() with open(fname) as f: for line in f: m = re.match(r'^\s*#\s*include\s+["<](\S+)[>"]', line) if m: inc = m.group(1) if inc in includes: print("{}: {}".format(fname, inc)) includes.add(m.group(1)) import sys for fname in sys.argv[1:]: findMulti(fname)
2018-02-20Merge remote-tracking branch 'fristonio/ticket-25261'Nick Mathewson
2018-02-16Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-02-16Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-02-16Merge remote-tracking branch 'dgoulet/ticket24902_029_05' into maint-0.2.9Nick Mathewson
2018-02-16stop calling channel_mark_client in response to a create_fastRoger Dingledine
since all it does is produce false positives this commit should get merged into 0.2.9 and 0.3.0 *and* 0.3.1, even though the code in the previous commit is already present in 0.3.1. sorry for the mess. [Cherry-picked]
2018-02-16stop calling channel_mark_client in response to a create_fastRoger Dingledine
since all it does is produce false positives this commit should get merged into 0.2.9 and 0.3.0 *and* 0.3.1, even though the code in the previous commit is already present in 0.3.1. sorry for the mess.
2018-02-16backport to make channel_is_client() accurateRoger Dingledine
This commit takes a piece of commit af8cadf3a9 and a piece of commit 46fe353f25, with the goal of making channel_is_client() be based on what sort of connection handshake the other side used, rather than seeing whether the other side ever sent a create_fast cell to us.
2018-02-16Remove the return value of node_get_prim_orport() and node_get_prim_dirport()Neel Chauhan
2018-02-16Compilation workaround for windows, which lacks O_SYNCNick Mathewson
Bug not in any released Tor.
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-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-15Merge branch 'bug18105'Nick Mathewson
2018-02-15man: Update the CircuitPriorityHalflife entryDavid Goulet
The behavior has changed slightly in the previous commits. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-02-15cmux: Always use the cmux policyDavid Goulet
Remove the checks on cmux->policy since it should always be set. Signed-off-by: David Goulet <dgoulet@torproject.org>