aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-06Merge branch 'maint-0.3.3' into release-0.3.3release-0.3.3Nick Mathewson
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.3.3' into release-0.3.3teor
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 branch 'maint-0.3.3' into release-0.3.3teor
2019-02-28Merge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3teor
2019-02-28Merge branch 'maint-0.3.3' into release-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.3.3' into release-0.3.3teor
2019-02-27Merge branch 'maint-0.2.9' into maint-0.3.3teor
2019-02-21Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2019-02-21Bump to 0.3.3.12-devNick Mathewson
2019-02-210.3.3.12: copy changelog to releasenotestor-0.3.3.12Nick Mathewson
2019-02-21Changelog for 0.3.3.12Nick Mathewson
2019-02-21Merge branch 'maint-0.3.3' into release-0.3.3Nick 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-21Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2019-02-21Update to 0.3.3.12Nick Mathewson
2019-02-21Start a changelog for 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-12Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2019-02-12Update geoip and geoip6 to the February 5 2019 database.Karsten Loesing
2019-02-05Merge branch 'maint-0.3.3' into release-0.3.3Roger Dingledine
2019-02-01Update Cargo.lock with new comment; suppress 29244.Nick Mathewson
2019-01-23Merge branch 'maint-0.3.3' into release-0.3.3Nick 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.3.3' into release-0.3.3Nick Mathewson
2019-01-18Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2019-01-18Fix the year for 0.3.3.11Nick 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-07Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2019-01-07Update to 0.3.3.3.11-devNick Mathewson
2019-01-07fix issues noted by traumschuletor-0.3.3.11Roger Dingledine
plus fix a bonus typo
2019-01-07Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2019-01-07Bump to 0.3.3.11Nick Mathewson
2019-01-07ChangeLog and ReleaseNotes for 0.3.3.11Nick Mathewson
2019-01-07Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2019-01-07Merge branch 'maint-0.3.3' into release-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 'maint-0.3.3' into release-0.3.3Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion