summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-08Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-06-08Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
2017-06-08Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
2017-06-08Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-06-08Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-06-08TROVE-2017-005: Fix assertion failure in connection_edge_process_relay_cellDavid Goulet
On an hidden service rendezvous circuit, a BEGIN_DIR could be sent (maliciously) which would trigger a tor_assert() because connection_edge_process_relay_cell() thought that the circuit is an or_circuit_t but is an origin circuit in reality. Fixes #22494 Reported-by: Roger Dingledine <arma@torproject.org> Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-06-05Rename "link" variable to avoid shadowing warning.Nick Mathewson
2017-06-05Merge branch 'bug22460_case2_029_01_squashed' into maint-0.2.9Nick Mathewson
2017-06-05Improve documentation on get_{peer,own}_certificate()Nick Mathewson
Make it clear that we're returning a newly allocated copy.
2017-06-05Changes file for the x509 link certificate case of bug22460Nick Mathewson
2017-06-05Repair link_handshake unit tests to mock tor_tls_get_own_cert()Nick Mathewson
The tests previously assumed that the link handshake code would be calling get_my_certs() -- when I changed it to call get_own_cert() instead for the (case 2) 22460 fix, the tests failed, since the tls connection wasn't really there. This change makes us start mocking out the tor_tls_get_own_cert() function too. It also corrects the behavior of the mock_get_peer_cert() function -- it should have been returning a newly allocated copy.
2017-06-05Test prerequisites: function to dup a cert, make get_own_cert mockable.Nick Mathewson
2017-06-05On v3 link handshake, send the correct link certificateNick Mathewson
Previously we'd send the _current_ link certificate, which would cause a handshaking failure when the TLS context rotated.
2017-06-05Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-06-05Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
2017-06-05Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
2017-06-05Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
Ours merge to avoid taking 4ee48cb434c46d9e4c477dabd8a97f03e3db221d
2017-06-05Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-06-05Fix C89 warning (since Tor 0.2.4-5 still care about that.)Nick Mathewson
2017-06-05Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-06-05Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
2017-06-05Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
2017-06-05Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-06-05Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-06-05Fix undefined behavior in geoip_parse_entry().Nick Mathewson
Fixes bug 22490; bugfix on 6a241ff3ffe7dc1 in 0.2.4.6-alpha. Found by teor using clang-5.0's AddressSanitizer stack-use-after-scope.
2017-05-25Stop leaking keypin-rejected routerinfos on directory authoritiesteor
When directory authorities reject a router descriptor due to keypinning, free the router descriptor rather than leaking the memory. Fixes bug 22370; bugfix on 0.2.7.2-alpha.
2017-05-22dir auths reject 0.2.9.x for x<5, due to bug 20499Roger Dingledine
Directory authorities now reject relays running versions 0.2.9.1-alpha through 0.2.9.4-alpha, because those relays suffer from bug 20499 and don't keep their consensus cache up-to-date. Resolves ticket 20509.
2017-05-16Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-05-16Update fallback directory mirrors in May 2017teor
Replace the 177 fallbacks originally introduced in Tor 0.2.9.8 in December 2016 (of which ~126 were still functional), with a list of 151 fallbacks (32 new, 119 existing, 58 removed) generated in May 2017. Resolves ticket 21564.
2017-05-10Merge branch 'prop275_minimal_029' into maint-0.2.9Nick Mathewson
2017-05-08Merge branch 'bug21943_029' into maint-0.2.9Nick Mathewson
2017-05-08Add a changes file for 21943.Nick Mathewson
2017-05-08Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-05-08Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
2017-05-08Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
2017-05-08Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-05-08Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-05-08Update geoip and geoip6 to the May 2 2017 database.Karsten Loesing
2017-04-26Add getpid() to the seccomp2 sandbox.Nick Mathewson
We hadn't needed this before, because most getpid() callers on Linux were looking at the vDSO version of getpid(). I don't know why at least one version of OpenSSL seems to be ignoring the vDSO, but this change should fix it. Fixes bug 21943; bugfix on 0.2.5.1-alpha when the sandbox was introduced.
2017-04-24control: Wrong check on base16_decode return valueDavid Goulet
The GETINFO extra-info/digest/<digest> broke in commit 568dc27a19 that refactored the base16_decode() API to return the decoded length. Unfortunately, that if() condition should have checked for the correct length instead of an error which broke the command in tor-0.2.9.1-alpha. Fixes #22034 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-04-06Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-04-06Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
2017-04-06Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
2017-04-06Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-04-06Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-04-06Update geoip and geoip6 to the April 4 2017 database.Karsten Loesing
2017-03-08Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-03-08Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
2017-03-08Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
2017-03-08Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion