aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-03-27Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-27Merge remote-tracking branch 'catalyst-github/bug25629-033' into maint-0.3.3Nick Mathewson
2018-03-27Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-03-27Merge remote-tracking branch 'catalyst-github/bug25629-032' into maint-0.3.2Nick Mathewson
2018-03-27Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
"ours" merge to avoid earlier version of 25629 fix.
2018-03-27Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-03-27Fix CID 1430932Taylor Yu
Coverity found a null pointer reference in nodelist_add_microdesc(). This is almost certainly impossible assuming that the routerstatus_t returned by router_get_consensus_status_by_descriptor_digest() always corresponds to an entry in the nodelist. Fixes bug 25629.
2018-03-27Fix CID 1430932Taylor Yu
Coverity found a null pointer reference in nodelist_add_microdesc(). This is almost certainly impossible assuming that the routerstatus_t returned by router_get_consensus_status_by_descriptor_digest() always corresponds to an entry in the nodelist. Fixes bug 25629.
2018-03-27Fix CID 1430932Taylor Yu
Coverity found a null pointer reference in nodelist_add_microdesc(). This is almost certainly impossible assuming that the routerstatus_t returned by router_get_consensus_status_by_descriptor_digest() always corresponds to an entry in the nodelist. Fixes bug 25629.
2018-03-27Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-27Merge branch 'bug25213_033' into maint-0.3.3Nick Mathewson
2018-03-26Merge branch 'bug24658-rm-curve25519-header' into bug24658-mergeNick Mathewson
2018-03-26Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-26Merge remote-tracking branch 'dgoulet/bug24904_033_01' into maint-0.3.3Nick Mathewson
2018-03-26Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-26Merge branch 'bug24903_029' into maint-0.3.3Nick Mathewson
2018-03-26Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-03-26Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-03-26Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-26Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-03-26Fix a unit test which was broken by the previous commitNick Mathewson
This test was expecting Tor to find and use routerinfos, but hadn't cleared the UseMicrodescriptors flag. Part of the fix for 25213.
2018-03-26Make extend_info_from_node() more picky about node contentsNick Mathewson
This update is needed to make it consistent with the behavior of node_awaiting_ipv6(), which doesn't believe in the addresses from routerinfos unless it actually plans to use those routerinfos. Fixes bug 25213; bugfix on b66b62fb7525cac1e1 in 0.3.3.1-alpha, which tightened up the definition of node_awaiting_ipv6().
2018-03-26When extending a circuit's path length, clear onehop_tunnel.Nick Mathewson
There was a nonfatal assertion in pathbias_should_count that would trigger if onehop_tunnel was set, but the desired_path_length was greater than 1. This patch fixes that. Fixes bug 24903; bugfix on 0.2.5.2-alpha.
2018-03-23Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-23Fix windows compilation warnings in hs_service.cNick Mathewson
These were breaking jenkins builds. Bugfix on 5804ccc9070dc54; bug not in any released Tor.
2018-03-23Define SRCDIR more correctly in configure.acNick Mathewson
Without this fix, we were just getting SRCDIR=`pwd`, which naturally was breaking out-of-tree builds. Bugfix on becae4c943969a4f4f14423cc897d39f41af7773; bug not in any released Tor.
2018-03-23test: more data on geoip load failure.Nick Mathewson
2018-03-23Merge remote-tracking branch 'fristonio/ticket-24740'Nick Mathewson
2018-03-23Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-23Merge branch 'bug25560_rebased_033' into maint-0.3.3Nick Mathewson
2018-03-23tests: Automatically detect Rust crates to test and also pass --verbose.Isis Lovecruft
* FIXES #25560: https://bugs.torproject.org/25560.
2018-03-23chan: Use channel_is_client() in channel_do_open_actions()David Goulet
Make sure we actually only report client channel to the geoip cache instead of looking if it is a known relay. Looking if it is a known relay can be unreliable because they come and go from the consensus. Fixes #24904 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-03-22hs: Fix two typos in an inline comment.Isis Lovecruft
* FIXES #25602: https://bugs.torproject.org/25602
2018-03-22Merge branch 'bug25399_squashed'Nick Mathewson
2018-03-22make changes file pass lintchangesNick Mathewson
2018-03-22Do not page-align mmap length. #25399Alex Xu (Hello71)
2018-03-22Merge remote-tracking branch 'public/geoip_testing'Nick Mathewson
2018-03-21Update tor_log to libc 0.2.39 as well.Nick Mathewson
2018-03-21Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-21Update src/ext/rust to latest master for libc update.Nick Mathewson
2018-03-21Merge branch 'maint-0.3.3'Nick Mathewson
2018-03-21Merge branch 'bug25310_r1_033' into maint-0.3.3Nick Mathewson
2018-03-21maint: Update Rust libc dependency from 0.2.22 to 0.2.39.Isis Lovecruft
Requires the update/libc-0.2.39 branch from https://github.com/isislovecruft/tor-rust-dependencies to be merged first.
2018-03-21maint: Add script for vendoring/updating Rust dependencies.Isis Lovecruft
* ADD documentation for usage both inside the script and in doc/HACKING/CodingStandardsRust.md * FIXES part of #25310: https://bugs.torproject.org/25310
2018-03-21doc: Document our current rough-draft policy on Rust dependencies.Isis Lovecruft
* FIXES #25310: https://bugs.torproject.org/25310
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-20Remove sb_poll check: all poll() calls are ok.Nick Mathewson
2018-03-20Add the poll() syscall as permitted by the sandboxNick Mathewson
Apparently, sometimes getpwnam will call this. Fixes bug 25513.
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion