aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-07hs-v3: Make service pick the exact amount of intro pointsDavid Goulet
When encoding introduction points, we were not checking if that intro points had an established circuit. When botting up, the service will pick, by default, 3 + 2 intro points and the first 3 that establish, we use them and upload the descriptor. However, the intro point is removed from the service descriptor list only when the circuit has opened and we see that we have already enough intro points, it is then removed. But it is possible that the service establishes 3 intro points successfully before the other(s) have even opened yet. This lead to the service encoding extra intro points in the descriptor even though the circuit is not opened or might never establish (#31561). Fixes #31548 Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-22Fix gcc build exclude on travisSebastian Hahn
The main build doesn't use HARDENING_OPTIONS, so the exclude shouldn't, either. Reduces the number of builders by one.
2019-08-19Merge branch 'maint-0.2.9' into maint-0.3.5Nick Mathewson
2019-08-15dirauth: Change dizum IP addressDavid Goulet
New IP address from 194.109.206.212 to 45.66.33.45. Signed request from Alex de Joode, operator of dizum: https://trac.torproject.org/projects/tor/ticket/31406 Published descriptor by dizum on August 12th, 2019: -- r dizum fqbq1v2DCDxTj0QDi7+gd1h911U GZmZtCLaPDQNxkhIFj8UcgTRAuA 2019-08-12 15:28:40 45.66.33.45 443 80 s Authority Fast Running Stable V2Dir Valid v Tor 0.4.0.5 pr Cons=1-2 Desc=1-2 DirCache=1-2 HSDir=1-2 HSIntro=3-4 HSRend=1-2 Link=1-5 LinkAuth=1,3 Microdesc=1-2 Relay=1-2 Padding=1 w Bandwidth=20 Unmeasured=1 p reject 1-65535 -- Finally, confirmed by DNS: $ dig +short tor.dizum.com 45.66.33.45 Closes #31406 Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-08-12Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1065' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1056' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/987' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/926' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/848' into maint-0.3.5teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5teor
2019-08-10Merge branch 'maint-0.2.9' into maint-0.3.5teor
Delete src/or/buffers.c which was fixup'ed in 0.2.9 but moved in 0.3.5. The 0.2.9 fix is not required for the 0.3.5 patch. Resolves merge conflict caused by 30041.
2019-08-10Merge remote-tracking branch 'tor-github/pr/1078' into maint-0.2.9teor
2019-08-10Merge remote-tracking branch 'tor-github/pr/1052' into maint-0.2.9teor
2019-08-10Merge remote-tracking branch 'tor-github/pr/1229' into maint-0.2.9teor
2019-08-10Modify "Protect buffers against INT_MAX datalen overflows." for 0.2.9Nick Mathewson
2019-08-09Merge remote-tracking branch 'tor-github/pr/1080' into maint-0.3.5teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/1054' into maint-0.3.5teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/920' into maint-0.3.5teor
2019-08-09Fix #28525 changes file that is breaking CI.George Kadianakis
2019-08-09Fix #28525 changes file that is breaking CI.George Kadianakis
2019-08-09Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/762' into maint-0.2.9teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/958' into maint-0.3.5teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/957' into maint-0.2.9teor
2019-08-09Merge branch 'bug31343_31374_029' into bug31343_31374_035teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/1222' into combined31343_31374_035teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/1210' into combined31343_31374_035teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029teor
2019-08-09Merge remote-tracking branch 'tor-github/pr/1209' into combined31343_31374_029teor
2019-08-08Merge branch 'ticket31374_029' into ticket31374_035Nick Mathewson
2019-08-08Fix a warning about casting the results of GetProcAddress.Nick Mathewson
Fixes bug 31374; bugfix on 0.2.9.1-alpha.
2019-08-08Merge branch 'ticket31343_029' into ticket31343_035Nick Mathewson
2019-08-08Fix another time_t/long warning for 31343.Nick Mathewson
2019-08-08Merge branch 'ticket31343_029' into ticket31343_035Nick Mathewson
2019-08-08Restore proper behavior of netinfo skew checkNick Mathewson
My previous fix removed a comparison, which would have caused us to warn about every skew instead of skews of over an hour.
2019-08-08Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5teor
Merge changed chutney and stem script lines from 29280 with changed stem script lines from 30591.
2019-08-08Merge branch 'maint-0.2.9' into maint-0.3.5teor
Merge rust additions in 0.3.5 with sudo deletions in 0.2.9.
2019-08-08Merge remote-tracking branch 'tor-github/pr/1156' into maint-0.3.5teor
2019-08-08Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9teor
2019-08-08Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9teor
2019-08-06Merge branch 'ticket31343_029' into ticket31343_035Nick Mathewson