aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-04-15Import timeouts.c directly from William Ahern's git.Nick Mathewson
Imported from here: https://github.com/wahern/timeout Imported as of upstream e5a9e8bfaa9c631bdc54002181795931b65bdc1a. All sources unmodified.
2016-04-14Merge branch 'assert_nonfatal_squashed'Nick Mathewson
2016-04-14Add an IF_BUG_ONCE macro, since that's a pretty common pattern too.Nick Mathewson
2016-04-14Add a BUG macro for usage in if checks.Nick Mathewson
2016-04-14Add new tor_assert_nonfatal*() macros.Nick Mathewson
Unlike tor_assert(), these macros don't abort the process. They're good for checking conditions we want to warn about, but which don't warrant a full crash. This commit also changes the default implementation for tor_fragile_assert() to tor_assert_nonfatal_unreached_once(). Closes ticket 18613.
2016-04-13fix typos/etc before i go nuts on #18809Roger Dingledine
2016-04-12Merge remote-tracking branch 'sebastian/stemtest'Nick Mathewson
2016-04-12Merge branch 'maint-0.2.8'Nick Mathewson
2016-04-12Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8Nick Mathewson
2016-04-07memarea: Don't assume that sizeof(ulong) >= sizeof(void*).Nick Mathewson
Fixes bug 18716; bugfix on 0.2.1.1-alpha where memarea.c was introduced. Found by wbenny.
2016-04-07Merge branch 'bug14334_squashed'Nick Mathewson
2016-04-07Don't mark guards as unreachable if connection_connect() fails.George Kadianakis
2016-04-07Turn TestingClientBootstrap* into non-testing optionsDavid Goulet
This changes simply renames them by removing "Testing" in front of them and they do not require TestingTorNetwork to be enabled anymore. Fixes #18481 Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2016-04-07When we get a bad nickname, explain what a good one is.Nick Mathewson
Closes #18300; patch from "icanhasaccount".
2016-04-07Merge branch 'maint-0.2.8'Nick Mathewson
2016-04-07Merge branch 'maint-0.2.7' into maint-0.2.8Nick Mathewson
2016-04-07Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2016-04-07Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2016-04-07Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2016-04-07Update geoip and geoip6 to the April 5 2016 database.Karsten Loesing
2016-04-05Merge branch 'maint-0.2.8'Nick Mathewson
2016-04-05Merge branch 'bug18728_028' into maint-0.2.8Nick Mathewson
2016-04-05Don't call the system toupper or tolower.Nick Mathewson
Yes, we could cast to unsigned char first, but it's probably safest to just use our own (in test_util), or remove bad-idea features that we don't use (in readpassphrase.c). Fixes 18728.
2016-04-05Merge branch 'maint-0.2.8'Nick Mathewson
2016-04-05quiet debug logs from periodic_event_dispatch()Roger Dingledine
Stop blasting twelve lines per second from periodic_event_dispatch() at loglevel debug. Resolves ticket 18729; fix on 0.2.8.1-alpha.
2016-04-05Merge branch 'maint-0.2.8'Nick Mathewson
2016-04-05Only define NEW_THREAD_API when not building with LibreSSL.Nick Mathewson
2016-04-05Merge remote-tracking branch 'teor/bug18720'Nick Mathewson
2016-04-05Merge branch 'maint-0.2.8'Nick Mathewson
2016-04-05Add a changes file for the OpenSSL 1.1.0 compilation fixes.Yawning Angel
2016-04-05OpenSSL 1.1.0-pre5-dev and later made BIO opaque.Yawning Angel
Detect newer versions and fix our TLS code to use the new API.
2016-04-05OpenSSL 1.1.0-pre4 and later(?) have a new "thread API".Yawning Angel
It appears that setting the various callbacks is no longer required, so don't.
2016-04-05Fix a comment typo in compat.hteor (Tim Wilson-Brown)
2016-04-05Clarify comments on connection_t's address fieldsteor (Tim Wilson-Brown)
2016-04-04Move tor_assert implementation into its own header/module.Nick Mathewson
2016-04-01Merge branch 'incoming_queue_symbol_fix'Nick Mathewson
2016-04-01Merge branch 'maint-0.2.8'Nick Mathewson
2016-04-01Merge branch 'bug18133_027' into maint-0.2.8Nick Mathewson
2016-04-01fix indentationNick Mathewson
2016-04-01Merge branch 'maint-0.2.8'Nick Mathewson
2016-04-01Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8Nick Mathewson
2016-03-30Merge branch 'bug15221_027' into maint-0.2.7Andrea Shepard
2016-03-29Don't declare "incoming_queue" in every file including channel.hNick Mathewson
Found with my wacky symbol-usage-enforcer.
2016-03-29Merge branch 'bug18570_027' into maint-0.2.7Andrea Shepard
2016-03-29majority of four is, alas, threeRoger Dingledine
2016-03-29fix typo in commentRoger Dingledine
2016-03-29Merge branch 'bug16248_027' into maint-0.2.7Andrea Shepard
2016-03-29Merge remote-tracking branch 'arma/feature18624'Nick Mathewson
2016-03-29Faravahar also versions.Nick Mathewson
2016-03-28Merge branch 'maint-0.2.8'Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion