summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-10main: remove level number comments from the subsystem list (0.4.0)teor
These levels get out of date really easily: we'll implement a level dump command in tor in 31614. They also cause conflicts and inconsistencies when merging forward level changes. Part of 31615.
2019-09-06subsys: Make the subsystem init order match the module dependenciesteor
Fix levels for subsystems that depend on log/err * winprocess (security) doesn't use err: * call windows process security APIs as early as possible * init err after winprocess * move wallclock so it's still after err * network and time depend on log: * make sure that network and time can use logging. * init network and time after log Add comments explaining the module init order. Fixes bug 31615; bugfix on 0.4.0.1-alpha.
2019-09-05Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-09-05Merge remote-tracking branch 'tor-github/pr/1271' into maint-0.3.5teor
2019-09-05Merge commit '763fd0ad66' into maint-0.4.0teor
tor-github/pr/1174, but with the last commit re-worded to remove the fixup, because fixups break our push rules.
2019-09-05Fix bugfix version in Bug 30649: Changes file.George Kadianakis
2019-08-30Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-08-30Merge remote-tracking branch 'tor-github/pr/1181' into maint-0.3.5teor
2019-08-30Merge remote-tracking branch 'tor-github/pr/1117' into maint-0.3.5teor
2019-08-30Merge remote-tracking branch 'tor-github/pr/1114' into maint-0.3.5teor
2019-08-29test: Change "make test-stem" so it only runs the stem tests that use torteor
This change makes test-stem faster and more reliable. Use "make test-stem-full" to run all of stem's tests. Closes ticket 31554.
2019-08-27Merge branch 'maint-0.3.5' into maint-0.4.0George Kadianakis
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.3.5' into maint-0.4.0Nick Mathewson
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 branch 'maint-0.3.5' into maint-0.4.0teor
2019-08-12Merge remote-tracking branch 'tor-github/pr/1049' into maint-0.4.0teor
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.3.5' into maint-0.4.0teor
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/1081' into maint-0.4.0teor
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_035' into bug31343_31374_040teor