aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-01-09Merge branch 'maint-0.3.5'Nick Mathewson
2019-01-09Add changes file for bug 28938Kris Katterjohn
The fix was in commit 30b84adb5f0b6e56d0fb82c374e3cb44089f64d0. Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-01-09Fix (and make consistent) the use of OpenBSD preprocessor macro testsKris Katterjohn
Prior to this commit, the testsuite was failing on OpenBSD. After this commit the testsuite runs fine on OpenBSD. It was previously decided to test for the OpenBSD macro (rather than __OpenBSD__, etc.) because OpenBSD forks seem to have the former macro defined. sys/param.h must be included for the OpenBSD macro definition; however, many files tested for the OpenBSD macro without having this header included. This commit includes sys/param.h in the files where the OpenBSD macro is used (and sys/param.h is not already included), and it also changes some instances of the __OpenBSD__ macro to OpenBSD. See commit 27df23abb675ffeb198bf0c1cc85c4baed77a988 which changed everything to use OpenBSD instead of __OpenBSD__ or OPENBSD. See also tickets #6982 and #20980 (the latter ticket is where it was decided to use the OpenBSD macro). Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-01-09Changes file for 28856Nick Mathewson
2019-01-09Merge branch 'ticket28856_v2'Nick Mathewson
2019-01-07Merge branch 'maint-0.3.5'Nick Mathewson
"ours" to avoid version bump
2019-01-07Update to 0.3.5.7-devNick Mathewson
2019-01-07Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
"ours" to avoid version bump
2019-01-07Update to 0.3.4.10-devNick Mathewson
2019-01-07Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
"Ours" to avoid version bump.
2019-01-07Update to 0.3.3.3.11-devNick Mathewson
2019-01-07Merge branch 'maint-0.3.5'Nick Mathewson
"ours" to avoid version bump.
2019-01-07Bump version to 0.3.5.7Nick Mathewson
2019-01-07Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
"ours" to avoid version bump.
2019-01-07Bump to 0.3.4.10Nick Mathewson
2019-01-07Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
"ours" merge to avoid version bump.
2019-01-07Bump to 0.3.3.11Nick Mathewson
2019-01-07Merge remote-tracking branch 'rl1987/doc28805'Nick Mathewson
2019-01-07Merge remote-tracking branch 'tlyu-github/bug28929'Nick Mathewson
2019-01-07Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2019-01-07Merge branch 'maint-0.3.5'Nick Mathewson
2019-01-07Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-01-07Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2019-01-07Update geoip and geoip6 to the January 3 2019 database.Karsten Loesing
2019-01-04Fix a warning in test_process.c on 32-bit platforms with clang.Nick Mathewson
Bug not in any released Tor.
2019-01-04Fix typo in bootstrap messageTaylor Yu
The message for the "ap_conn_proxy" bootstrap status tag was missing some text. Fixes bug 28929. Bug not in any released Tor.
2019-01-04Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2019-01-04Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-01-04Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2019-01-04Merge branch 'maint-0.3.5'Nick Mathewson
2019-01-04Merge branch 'bug21394_029_redux' into maint-0.2.9Nick Mathewson
2019-01-04Remove from master those changes files that will appear in 0.3.5.7 or earlier.Nick Mathewson
2019-01-04Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2019-01-04Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-01-04Merge branch 'maint-0.3.5'Nick Mathewson
2019-01-04Merge remote-tracking branch 'dgoulet/ticket28619_033_01' into maint-0.3.3Nick Mathewson
2019-01-04Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2019-01-04Merge branch 'maint-0.3.5'Nick Mathewson
2019-01-04Merge branch 'ticket27750_034_01_squashed' into maint-0.3.4Nick Mathewson
2019-01-03Merge branch 'maint-0.3.5'Nick Mathewson
2019-01-03Merge branch 'ticket28879' into maint-0.3.5Nick Mathewson
2019-01-03Merge branch 'ticket28880'Nick Mathewson
2019-01-03Merge branch 'ticket28852'Nick Mathewson
2019-01-03Add a #ifdef HAVE_UNISTD_H check to buffers.cNick Mathewson
Reported on tor-dev by Gisle Vanem. Bug not in any released Tor (The suggested patch used _MSC_VER, but that's not how we do stuff with autoconf. With autoconf, you detect the feature you want, rather than trying to list all the systems that do or do not have it.)
2019-01-03Merge branch 'maint-0.3.5'Nick Mathewson
2019-01-03Merge branch 'ticket28851_035_squashed' into maint-0.3.5Nick Mathewson
2019-01-03Stop re-checking our hardcoded dh parameters on every startupNick Mathewson
Closes ticket 28851.
2019-01-03Merge branch 'maint-0.3.5'Nick Mathewson
2019-01-03Merge remote-tracking branch 'public/ticket28838_035' into maint-0.3.5Nick Mathewson
2019-01-03Merge branch 'maint-0.3.5'Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion