summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-24changes: use correct bugfix release, and reword changes file for 31408teor
2019-09-23Fix bug when %including folder with comment only files. #31408Daniel Pinto
When processing a %included folder, a bug caused the pointer to the last element of the options list to be set to NULL when processing a file with only comments or whitepace. This could cause options from other files on the same folder to be discarded depending on the lines after the affected %include.
2019-09-17Merge remote-tracking branch 'tor-github/pr/1300' into maint-0.3.5Nick Mathewson
2019-09-17Merge branch 'maint-0.2.9' into maint-0.3.5Nick Mathewson
2019-09-17Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9Nick Mathewson
2019-09-17Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5Nick Mathewson
2019-09-17Merge branch 'maint-0.2.9' into maint-0.3.5Nick Mathewson
"ours" merge to avoid picking up 0.2.9 version of ticket 31673.
2019-09-10pf: when extracting an IPv6 address, make sure we got an IPv6 addressNick Mathewson
Our code assumes that when we're configured to get IPv6 addresses out of a TRANS_PF transparent proxy connection, we actually will. But we didn't check that, and so FreeBSD started warning us about a potential NULL pointer dereference. Fixes part of bug 31687; bugfix on 0.2.3.4-alpha when this code was added.
2019-09-10fp.c: Suppress float-conversion warnings on FreeBSD.Nick Mathewson
We used to do this on Windows only, but it appears to affect multiple platforms when building with certain versions of GCC, and a common pattern for defining the floating-point classifier functions. Fixes part of 31687. I'm calling this a bugfux on 31687, when we started suppressing these warnings on Windows.
2019-09-09build: The <sys/sysctl.h> is now deprecated on LinuxDavid Goulet
Closes #31673
2019-09-09build: The <sys/sysctl.h> is now deprecated on LinuxDavid Goulet
Closes #31673
2019-09-06entrynodes: Make routine descriptor expiry notice logs less alarmingteor
When tor is missing descriptors for some primary entry guards, make the log message less alarming. It's normal for descriptors to expire, as long as tor fetches new ones soon after. Fixes bug 31657; bugfix on 0.3.3.1-alpha.
2019-09-05Merge remote-tracking branch 'tor-github/pr/1271' into maint-0.3.5teor
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-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
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion