Nick Mathewson
a885271c08
Add new tor_assert_nonfatal*() macros.
...
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-14 16:24:28 -04:00
Roger Dingledine
525307c0ea
fix typos/etc before i go nuts on #18809
2016-04-13 00:06:30 -04:00
Nick Mathewson
0630f1982d
Add LCOV_EXCL* markers to crypto.c and crypto_s2k.c
...
This marks some lines as unreachable by the unit tests, and as
therefore excluded from test coverage.
(Note: This convention is only for lines that are absolutely
unreachable. Don't use it anywhere you wouldn't add a
tor_fragile_assert().)
2016-04-12 21:13:33 -04:00
Nick Mathewson
4043f2c95f
Adopt the LCOV convention for marking lines as unreachable by tests.
...
Document this convention.
Add a script to post-process .gcov files in order to stop nagging us
about excluded lines.
Teach cov-diff to handle these post-processed files.
Closes ticket 16792
2016-04-12 21:12:10 -04:00
Roger Dingledine
0aacc07036
encourage rejected relays to contact us
...
When the directory authorities refuse a bad relay's descriptor,
encourage the relay operator to contact us. Many relay operators
won't notice this line in their logs, but it's a win if even a
few learn why we don't like what their relay was doing.
Resolves ticket 18760.
I didn't specify a contact mechanism (e.g. an email address), because
every time we've done that in the past, a few years later we noticed
that the code was pointing people to an obsolete contact address.
2016-04-12 19:54:04 -04:00
Nick Mathewson
bd34edc18d
Merge remote-tracking branch 'sebastian/stemtest'
2016-04-12 13:13:15 -04:00
Nick Mathewson
eafcd7b0fc
Merge branch 'maint-0.2.8'
2016-04-12 13:02:37 -04:00
Nick Mathewson
7babf33239
Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8
2016-04-12 13:02:02 -04:00
Nick Mathewson
1a065cea46
Do not link tests against both libor.a and libor-testing.a
...
Also, put libor-testing.a at a better position in the list of
libraries, to avoid linker errors.
This is a fix, or part of a fix, for 18490.
Conflicts:
src/test/include.am
2016-04-12 02:48:46 +00:00
Nick Mathewson
39c057d45a
memarea: Don't assume that sizeof(ulong) >= sizeof(void*).
...
Fixes bug 18716; bugfix on 0.2.1.1-alpha where memarea.c was
introduced. Found by wbenny.
2016-04-07 11:10:14 -04:00
Nick Mathewson
591029253f
Merge branch 'bug14334_squashed'
2016-04-07 10:59:55 -04:00
George Kadianakis
d5acb633ae
Don't mark guards as unreachable if connection_connect() fails.
2016-04-07 10:59:46 -04:00
David Goulet
40827da3bf
Turn TestingClientBootstrap* into non-testing options
...
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-07 10:57:59 -04:00
Nick Mathewson
7532cd439b
When we get a bad nickname, explain what a good one is.
...
Closes #18300 ; patch from "icanhasaccount".
2016-04-07 10:54:53 -04:00
Nick Mathewson
e703484722
Merge branch 'maint-0.2.8'
2016-04-07 10:46:15 -04:00
Nick Mathewson
d8a056daed
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-04-07 10:46:07 -04:00
Nick Mathewson
ad4ff7a5b9
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-04-07 10:45:46 -04:00
Nick Mathewson
2ce99b9f48
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-04-07 10:45:38 -04:00
Nick Mathewson
34a51d1621
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-04-07 10:45:32 -04:00
Karsten Loesing
97c6e717b9
Update geoip and geoip6 to the April 5 2016 database.
2016-04-07 11:10:09 +02:00
Nick Mathewson
d5b3679392
Merge branch 'maint-0.2.8'
2016-04-05 23:56:21 -04:00
Nick Mathewson
f6ffe532ab
Merge branch 'bug18728_028' into maint-0.2.8
2016-04-05 23:56:05 -04:00
Nick Mathewson
d7a0382ba3
Don't call the system toupper or tolower.
...
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-05 23:22:28 -04:00
Nick Mathewson
20d39e86af
Merge branch 'maint-0.2.8'
2016-04-05 23:18:48 -04:00
Roger Dingledine
d037369e56
quiet debug logs from periodic_event_dispatch()
...
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-05 23:13:55 -04:00
Nick Mathewson
b46d126e64
Merge branch 'maint-0.2.8'
2016-04-05 10:38:53 -04:00
Nick Mathewson
967491f156
Only define NEW_THREAD_API when not building with LibreSSL.
2016-04-05 10:38:15 -04:00
Nick Mathewson
16f7851807
Merge remote-tracking branch 'teor/bug18720'
2016-04-05 10:08:11 -04:00
Nick Mathewson
6720628c97
Merge branch 'maint-0.2.8'
2016-04-05 10:06:18 -04:00
Yawning Angel
92ae6b9524
Add a changes file for the OpenSSL 1.1.0 compilation fixes.
2016-04-05 10:03:25 -04:00
Yawning Angel
5db21f8f81
OpenSSL 1.1.0-pre5-dev and later made BIO opaque.
...
Detect newer versions and fix our TLS code to use the new API.
2016-04-05 10:03:24 -04:00
Yawning Angel
6729d7328c
OpenSSL 1.1.0-pre4 and later(?) have a new "thread API".
...
It appears that setting the various callbacks is no longer required, so
don't.
2016-04-05 10:03:24 -04:00
teor (Tim Wilson-Brown)
6a2b4db4f9
Fix a comment typo in compat.h
2016-04-05 13:45:37 +10:00
teor (Tim Wilson-Brown)
5d2b1c784b
Clarify comments on connection_t's address fields
2016-04-05 13:45:09 +10:00
Nick Mathewson
7865402106
Move tor_assert implementation into its own header/module.
2016-04-04 11:06:04 -04:00
Nick Mathewson
705d3b221e
Merge branch 'incoming_queue_symbol_fix'
2016-04-01 14:16:49 -04:00
Nick Mathewson
4b3e6c4d43
Merge branch 'maint-0.2.8'
2016-04-01 08:18:03 -04:00
Nick Mathewson
fdb57db581
Merge branch 'bug18133_027' into maint-0.2.8
2016-04-01 08:17:56 -04:00
Nick Mathewson
4093f343ca
fix indentation
2016-04-01 08:16:21 -04:00
Nick Mathewson
9e57ffa520
Merge branch 'maint-0.2.8'
2016-04-01 08:15:05 -04:00
Nick Mathewson
e247093e0e
Merge remote-tracking branch 'karsten/task-18460-2' into maint-0.2.8
2016-04-01 08:10:58 -04:00
Yawning Angel
a19f4192da
Issue a STATUS_SERVER
event on meaningful hibernation state changes.
...
Implements feature #18685 .
2016-03-30 20:19:11 +00:00
Andrea Shepard
183d465f0e
Merge branch 'bug15221_027' into maint-0.2.7
2016-03-30 12:23:42 +00:00
Nick Mathewson
beba70ec77
Don't declare "incoming_queue" in every file including channel.h
...
Found with my wacky symbol-usage-enforcer.
2016-03-29 13:55:14 -04:00
Andrea Shepard
0b45cab147
Merge branch 'bug18570_027' into maint-0.2.7
2016-03-29 15:01:36 +00:00
Roger Dingledine
93c311daa8
majority of four is, alas, three
2016-03-29 10:57:01 -04:00
Roger Dingledine
1103d82492
fix typo in comment
2016-03-29 10:56:26 -04:00
Andrea Shepard
1218d731d1
Merge branch 'bug16248_027' into maint-0.2.7
2016-03-29 14:33:45 +00:00
Nick Mathewson
4e76b206b5
Merge remote-tracking branch 'arma/feature18624'
2016-03-29 08:06:21 -04:00
Nick Mathewson
e1f4d9552e
Faravahar also versions.
2016-03-29 07:55:02 -04:00