aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-06Merge branch 'maint-0.2.9' into maint-0.3.3maint-0.3.3Nick Mathewson
2019-03-06Update geoip and geoip6 to the March 4 2019 database.Karsten Loesing
2019-03-01Merge branch 'maint-0.2.9' into maint-0.3.3teor
2019-03-01Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9teor
2019-03-01Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9teor
2019-03-01Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9teor
2019-02-28Merge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3teor
2019-02-28Merge branch 'maint-0.2.9' into maint-0.3.3teor
2019-02-27test/shared-random: use sr_state_free_all() rather than sr_state_free()teor
sr_state_free() was renamed to sr_state_free_all() between 0.2.9 and 0.3.3. Part of 29599.
2019-02-27Merge branch 'bug29599_029' into bug29599_033teor
2019-02-27test/shared-random: Stop leaking shared random state in the unit teststeor
Stop leaking parts of the shared random state in the shared-random unit tests. Fixes bug 29599; bugfix on 0.2.9.1-alpha.
2019-02-27Merge branch 'maint-0.2.9' into maint-0.3.3teor
2019-02-21Bump to 0.3.3.12-devNick Mathewson
2019-02-21kist: Don't write above the highwater outbuf markDavid Goulet
KIST works by computing how much should be allowed to write to the kernel for a given socket, and then it writes that amount to the outbuf. The problem is that it could be possible that the outbuf already has lots of data in it from a previous scheduling round (because the kernel is full/busy and Tor was not able to flush the outbuf yet). KIST ignores that the outbuf has been filling (is above its "highwater") and writes more anyway. The end result is that the outbuf length would exceed INT_MAX, hence causing an assertion error and a corresponding "Bug()" message to get printed to the logs. This commit makes it for KIST to take into account the outbuf length when computing the available space. Bug found and patch by Rob Jansen. Closes #29168. TROVE-2019-001. Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-02-21Update to 0.3.3.12Nick Mathewson
2019-02-19Fix a compiler warning on OpenBSDKris Katterjohn
malloc_options needs to be declared extern (and declaring it extern means we need to initialize it separately) Fixes bug 29145; bugfix on 0.2.9.3-alpha Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-02-12Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2019-02-12Update geoip and geoip6 to the February 5 2019 database.Karsten Loesing
2019-02-01Update Cargo.lock with new comment; suppress 29244.Nick Mathewson
2019-01-23Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
"ours" merge to avoid dropping non-broken changes files after removal of merged 0.2.9 changes files.
2019-01-23maint-0.2.9: remove changes files that are merged in 0.2.9 releasesNick Mathewson
Many of these files cause check-changes to fail, which will be a long-term problem as we continue to support 0.2.9.
2019-01-18Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2019-01-10rend: stop warning when clients send multiple rend establish cellsteor
Stop logging "Tried to establish rendezvous on non-OR circuit..." as a warning. Instead, log it as a protocol warning, because there is nothing that relay operators can do to fix it. Fixes bug 29029; bugfix on 0.2.5.7-rc.
2019-01-07Update to 0.3.3.3.11-devNick Mathewson
2019-01-07Bump to 0.3.3.11Nick Mathewson
2019-01-07Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2019-01-07Update geoip and geoip6 to the January 3 2019 database.Karsten Loesing
2019-01-04Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2019-01-04Merge branch 'bug21394_029_redux' into maint-0.2.9Nick Mathewson
2019-01-04Merge remote-tracking branch 'dgoulet/ticket28619_033_01' into maint-0.3.3Nick Mathewson
2019-01-03Merge branch 'ticket28973_033_squashed' into maint-0.3.3Nick Mathewson
2019-01-03Detect openssl bug 7712 and work around it.Nick Mathewson
In theory it would be better to detect this bug in advance, but this approach is much simpler, and therefore safer to backport. This closes tor issue 28973.
2018-12-11Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-12-11Note ticket number in changes file for 24803Nick Mathewson
2018-12-11Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-12-10Fallbacks: Update the hard-coded fallback list in December 2018teor
Merge Phoul's two lists into teor's list. Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in January 2018 (of which ~115 were still functional), with a list of 157 fallbacks (92 new, 65 existing, 85 removed) generated in December 2018. Closes ticket 24803.
2018-12-07Fallbacks: Update the hard-coded fallback list in December 2018teor
Replace the 150 fallbacks originally introduced in Tor 0.3.3.1-alpha in January 2018 (of which ~115 were still functional), with a list of 148 fallbacks (89 new, 59 existing, 91 removed) generated in December 2018. Closes ticket 24803.
2018-12-06Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-12-05Update geoip and geoip6 to the December 5 2018 database.Karsten Loesing
2018-11-26hs-v3: Do not close RP circuits when deleting an ephemeral serviceDavid Goulet
Bug reported on tor-dev@ and here is the detail explanation of the issue: https://lists.torproject.org/pipermail/tor-dev/2018-November/013558.html Fixes bug #28619 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-11-22Test: Fix memory leaks and missing unmocks in entry guard teststeor
test_entry_guard_outdated_dirserver_exclusion leaks memory, and is missing some unmocks. Fixes 28554; bugfix on 0.3.0.1-alpha.
2018-11-15Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-11-15Merge branch 'bug26913_033' into maint-0.3.3Nick Mathewson
2018-11-15Merge remote-tracking branch 'public/bug24104_029_squashed' into maint-0.2.9Nick Mathewson
Resolved conflicts with the 26269 fix in 015fcd0e1191aa6f.
2018-11-15Merge remote-tracking branch 'dgoulet/bug27550_033_01' into maint-0.3.3Nick Mathewson
2018-11-14Work around check-spaces.Nick Mathewson
2018-11-14Changes file for bug 28419Nick Mathewson
2018-11-14libtorrunner: fix memory leak in child() error pathMartin Kepplinger
This avoids leaking memory in case libtorrunner's child() function fails.
2018-11-13Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-11-13Merge branch 'bug28413_029' into maint-0.2.9Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion