summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-01-16Bump copyright date to 2019.Nick Mathewson
2019-01-14Rework rep_hist_log_link_protocol_counts()rl1987
2019-01-11Merge remote-tracking branch 'tor-github/pr/563' into maint-0.3.5Nick Mathewson
2019-01-09Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5Nick Mathewson
2019-01-09Stop logging 'Your Guard' in circpathbias.crl1987
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-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-07Fix tor_ersatz_socketpair on IPv6-only systemsKris Katterjohn
In get_local_listener used by tor_ersatz_socketpair, the address family used when binding the IPv6 socket was AF_INET instead of AF_INET6. Fixes bug 28995; bugfix on 0.3.5.1-alpha. Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
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 branch 'maint-0.3.4' into maint-0.3.5Nick 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-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 'bug21394_029_redux' into maint-0.2.9Nick 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 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 'ticket27750_034_01_squashed' into maint-0.3.4Nick Mathewson
2019-01-03Merge branch 'ticket28879' into maint-0.3.5Nick 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 remote-tracking branch 'public/ticket28838_035' into maint-0.3.5Nick Mathewson
2019-01-03Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-01-03Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2019-01-03Merge branch 'ticket28973_033_squashed' into maint-0.3.3Nick Mathewson
2019-01-03Detect openssl bug 7712 and work around it.Nick Mathewson
In theory it would be better to detect this bug in advance, but this approach is much simpler, and therefore safer to backport. This closes tor issue 28973.
2019-01-02Merge branch 'bug28974_035' into maint-0.3.5Nick Mathewson
2019-01-02ticket 28924 deserves a changes file. I made one, but I guess I forgot to ↵Nick Mathewson
git add
2019-01-02Add an errno.h include to freespace.c to fix bug 28974.Nick Mathewson
2018-12-21Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2018-12-21mainloop: Reactivate the linked connection event with a non empty listDavid Goulet
Linked connections aren't woken up by libevent due to I/O but rather artificially so we can, by chunks, empty the spooled object(s). Commit 5719dfb48f87a54aeb5982ff03345303bc058ebb (in 0.3.4.1-alpha) made it that the schedule_active_linked_connections_event would be only called once at startup but this is wrong because then we would never go through again the active linked connections. Fortunately, everytime a new linked connection is created, the event is activated and thus we would go through the active list again. On a busy relay, this issue is mitigated by that but on a slower relays or bridge, a connection could get stuck for a while until a new directory information request would show up. Fixes #28717, #28912
2018-12-21Try @warning_flags to avoid bloating verbose make logsNick Mathewson
We now accumulate warning flags in a separate variable, "TOR_WARNING_FLAGS", and write it to a "warning_flags" file. Then we test whether the compiler will accept "@warning_flags": if so, we put "@warning_flags" in the CFLAGS; if not, we copy the contents of "$TOR_WARNING_FLAGS" into the CFLAGS. Closes ticket 28924.
2018-12-20Merge remote-tracking branch 'tor-github/pr/607' into maint-0.3.5Nick Mathewson
2018-12-20Stop running stem's unit tests as part of "make test-stem"teor
But continue to run stem's unit and online tests during "make test-stem-full". Fixes bug 28568; bugfix on 0.2.6.3-alpha.
2018-12-19Merge branch 'ticket28883_035' into maint-0.3.5Nick Mathewson
2018-12-18Merge branch 'bug28612_squashed' into maint-0.3.5Nick Mathewson
2018-12-18Call run_tor_main_loop() in ntmain.c, rather than do_main_loop().Nick Mathewson
Fixes bug 28612; bugfix on 0.3.5.3-alpha.
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion