aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-14Merge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4teor
2019-03-14Merge branch 'bug28096-029-squashed' into bug28096-034-squashedteor
Merge the new code, and preserve the #else macro comment from 0.3.4.
2019-03-14Merge remote-tracking branch 'nickm/bug27073_029' into bug27073_034teor
Replace == with OP_EQ in test macros.
2019-03-14Merge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/765' into maint-0.2.9teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/746' into maint-0.2.9teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/510' into maint-0.2.9teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/331' into maint-0.2.9teor
2019-03-09test/sr: Free SRVs before replacing them in test_sr_setup_srv()teor
Stop leaking parts of the shared random state in the shared-random unit tests. The previous fix in 29599 was incomplete. Fixes bug 29706; bugfix on 0.2.9.1-alpha.
2019-03-08hs-v2: Copy needed information between service on prunningDavid Goulet
Turns out that when reloading a tor configured with hidden service(s), we weren't copying all the needed information between the old service object to the new one. For instance, the desc_is_dirty timestamp wasn't which could lead to the service uploading its descriptor much later than it would need to. The replaycache wasn't also moved over and some intro point information as well. Fixes #23790 Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-03-08Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixesteor
2019-03-06Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2019-03-06Merge branch 'maint-0.3.3' into maint-0.3.4Nick 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.4' into release-0.3.4teor
2019-03-01Merge branch 'maint-0.3.3' into maint-0.3.4teor
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-03-01Bug 25733: Avoid assert failure if all circuits time out.Mike Perry
Prior to #23100, we were not counting HS circuit build times in our calculation of the timeout. This could lead to a condition where our timeout was set too low, based on non HS circuit build times, and then we would abandon all HS circuits, storing no valid timeouts in the histogram. This commit avoids the assert.
2019-02-28Merge branch 'maint-0.3.4' into release-0.3.4teor
2019-02-28Merge branch 'maint-0.3.3' into maint-0.3.4teor
2019-02-28Merge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3teor
2019-02-28Merge branch 'maint-0.3.4' into release-0.3.4teor
2019-02-28Merge branch 'maint-0.3.3' into maint-0.3.4teor
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.4' into release-0.3.4teor
2019-02-27Merge branch 'maint-0.3.3' into maint-0.3.4teor
2019-02-27Merge branch 'maint-0.2.9' into maint-0.3.3teor
2019-02-21Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2019-02-21Bump to 0.3.4.11-devNick Mathewson
2019-02-21Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
"ours" to avoid version bump
2019-02-21Bump to 0.3.3.12-devNick Mathewson
2019-02-210.3.4.11: copy changelog to releasenotestor-0.3.4.11Nick Mathewson
2019-02-21Add TROVE-2019-001 to changelog for 0.3.4.11Nick Mathewson
2019-02-21Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-02-21Merge branch 'maint-0.3.4' into release-0.3.4Nick 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.4' into release-0.3.4Nick Mathewson
2019-02-21Bump to 0.3.4.11Nick Mathewson
2019-02-21Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-02-21Update to 0.3.3.12Nick Mathewson
2019-02-21Start a changelog for 0.3.4.11Nick 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>
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion