fe9f585143
fix wrong word in comment
2018-07-30 22:35:33 -04:00
acb54dee7b
Remove a now-obsolete comment about deadcode_dummy__
2018-07-30 09:09:10 -04:00
70b16bc679
Merge branch 'ticket26890'
2018-07-30 09:08:39 -04:00
3a6bd21440
Merge remote-tracking branch 'teor/bug26627_033_merged_master'
2018-07-30 09:01:55 -04:00
49d8a2109f
Update include in tor-print-ed-signing-cert
2018-07-30 08:57:18 -04:00
ff593ae878
Merge remote-tracking branch 'rl1987/feature19506_3'
2018-07-30 08:55:57 -04:00
13393b2d91
Merge remote-tracking branch 'rl1987/ticket21349_4'
2018-07-30 08:49:49 -04:00
ec1ced3cc1
Merge remote-tracking branch 'teor/bug26924'
2018-07-30 08:44:58 -04:00
ac9d08f66a
Merge remote-tracking branch 'juga/ticket3723_03_squashed_rebased'
2018-07-30 08:33:59 -04:00
811ed8cf9f
Merge remote-tracking branch 'rl1987/bug26892_take2'
2018-07-30 08:24:14 -04:00
5823e62fa2
Merge branch 'maint-0.3.4'
2018-07-30 08:17:25 -04:00
d102e9c2e4
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-30 08:17:25 -04:00
15d7f24c57
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-30 08:17:24 -04:00
a8bdb851eb
Don't disable an unsupported compiler warning
...
Conditionalize the pragma that temporarily disables
-Wunused-const-variable. Some versions of gcc don't support it. We
need to do this because of an apparent bug in some libzstd headers.
Fixes bug 26785; bugfix on 0.3.2.11.
2018-07-26 12:32:34 -05:00
ffdfd39d4f
Early bailout from log_addr_has_changed() if running as client
2018-07-26 17:49:27 +03:00
db2a9180be
Remove comment about Tor2web
...
Part of #26367 .
2018-07-25 17:40:20 +10:00
d01602bebb
Merge branch 'bug26924_032' into bug26924
...
Update rendcommon.h include path.
2018-07-25 14:50:45 +10:00
859d5a7375
Improve connection auth logging
...
Improve the log message when connection initiators fail to authenticate
direct connections to relays.
Fixes bug 26927; bugfix on 0.3.0.1-alpha.
2018-07-25 14:39:31 +10:00
fdc3ad6259
Merge branch 'bug26924_029' into bug26924_032
2018-07-25 14:33:10 +10:00
6443812e34
Stop logging link auth warnings on Single Onion Services and Tor2web
...
Instead, log a protocol warning when single onion services or
Tor2web clients fail to authenticate direct connections to relays.
Fixes bug 26924; bugfix on 0.2.9.1-alpha.
2018-07-25 14:30:33 +10:00
fc4d08e260
Merge branch 'bug26627_033' into bug26627_033_merged_master
2018-07-25 09:17:17 +10:00
3821081a55
Stop putting unsupported ed25519 link auth in v3 onion service descs
...
Stop putting ed25519 link specifiers in v3 onion service descriptors,
when the intro point doesn't support ed25519 link authentication.
Fixes bug 26627; bugfix on 0.3.2.4-alpha.
2018-07-25 09:16:15 +10:00
a99920c7d4
Stop sending unsupported ed25519 link specifiers in v3 introduce cells
...
Stop sending ed25519 link specifiers in v3 onion service introduce
cells, when the rendezvous point doesn't support ed25519 link
authentication.
Fixes bug 26627; bugfix on 0.3.2.4-alpha.
2018-07-25 09:16:04 +10:00
042d22c8d1
Split select_entry_guard_for_circuit()
2018-07-21 18:38:33 +03:00
e6c51a056c
Make entry_guards_update_primary() shorter
2018-07-21 18:38:33 +03:00
86549c0d9e
Split sampled_guards_update_from_consensus() into subfunctions
2018-07-21 18:38:33 +03:00
c515dc8d0d
Remove over-cleverness from our coverity BUG() definition.
...
Our previous definition implied that code would never keep running
if a BUG occurred (which it does), and that BUG(x) might be true
even if x was false (which it can't be).
Closes ticket 26890. Bugfix on 0.3.1.4-alpha.
2018-07-20 11:19:54 -04:00
9ae3597540
Tweak assertion in get_time_period_length() for coverity
...
This is another attempt to fix 1437668. The assertion here should
be safe, since the rules of networkstatus_get_param() keep the value
it returns in range.
2018-07-20 11:02:07 -04:00
977821e59f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-20 10:42:29 -04:00
dbf57ecf39
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-20 10:42:29 -04:00
583df33e20
Merge branch 'maint-0.3.4'
2018-07-20 10:42:29 -04:00
be3a962ca7
Merge branch 'ticket26647_032' into maint-0.3.2
2018-07-20 10:42:23 -04:00
3c49019016
Merge branch 'maint-0.3.4'
2018-07-19 14:34:26 -04:00
7260d07fee
Fix linking when dirauth module is disabled.
...
Bugfix on dcee4d4c9c
2018-07-19 14:33:18 -04:00
c1092e9aab
Merge remote-tracking branch 'ahf-github/bugs/26780'
2018-07-19 12:22:39 -04:00
7253603e6b
Merge branch 'bug26712'
2018-07-19 12:20:13 -04:00
b44fce6716
Merge branch 'maint-0.3.4'
2018-07-19 08:32:00 -04:00
0a60a94a55
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-19 08:31:07 -04:00
27f5bd52fe
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-19 08:31:07 -04:00
209332e71a
Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2
2018-07-19 08:30:59 -04:00
144fc9bef1
wrap a multi-line if body in { } before somebody gets hurt
2018-07-18 21:23:35 -04:00
9e247ac271
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-18 16:39:10 -04:00
39d3187b0d
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-18 16:39:10 -04:00
78386d8cdd
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-18 16:39:10 -04:00
501deba8cf
Try putting ulimit -c 0 in test_bt.sh to see if it fixes bug 26787
2018-07-18 16:33:48 -04:00
42c02097db
Add two more dependencies in build.rs
2018-07-18 16:20:31 -04:00
0c4c5eeb55
Use the "testing" variant of several C libraries in build.rs
2018-07-18 16:18:25 -04:00
e2261e7727
Merge remote-tracking branch 'isis/bug26398'
2018-07-18 16:12:29 -04:00
23811052fe
Add some missing includes and struct declarations.
2018-07-18 15:12:18 -04:00
61e080e24a
Merge branch 'maint-0.3.4'
2018-07-18 15:09:28 -04:00
Roger Dingledine
Nick Mathewson
Taylor Yu
rl1987
teor
teor