Nick Mathewson
13393b2d91
Merge remote-tracking branch 'rl1987/ticket21349_4'
2018-07-30 08:49:49 -04:00
Nick Mathewson
b8e94b2f1d
Merge branch 'maint-0.3.4'
2018-07-30 08:45:01 -04:00
Nick Mathewson
7d66ec0feb
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-30 08:45:01 -04:00
Nick Mathewson
a159eaf45f
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-30 08:45:01 -04:00
Nick Mathewson
ec1ced3cc1
Merge remote-tracking branch 'teor/bug26924'
2018-07-30 08:44:58 -04:00
Nick Mathewson
fea35ddf00
Merge remote-tracking branch 'teor/bug26924_032' into maint-0.3.2
2018-07-30 08:44:40 -04:00
Nick Mathewson
ac9d08f66a
Merge remote-tracking branch 'juga/ticket3723_03_squashed_rebased'
2018-07-30 08:33:59 -04:00
Nick Mathewson
811ed8cf9f
Merge remote-tracking branch 'rl1987/bug26892_take2'
2018-07-30 08:24:14 -04:00
Nick Mathewson
d102e9c2e4
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-30 08:17:25 -04:00
Nick Mathewson
5823e62fa2
Merge branch 'maint-0.3.4'
2018-07-30 08:17:25 -04:00
Nick Mathewson
15d7f24c57
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-30 08:17:24 -04:00
Taylor Yu
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
rl1987
ffdfd39d4f
Early bailout from log_addr_has_changed() if running as client
2018-07-26 17:49:27 +03:00
teor
db2a9180be
Remove comment about Tor2web
...
Part of #26367 .
2018-07-25 17:40:20 +10:00
teor
d01602bebb
Merge branch 'bug26924_032' into bug26924
...
Update rendcommon.h include path.
2018-07-25 14:50:45 +10:00
teor
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
teor
fdc3ad6259
Merge branch 'bug26924_029' into bug26924_032
2018-07-25 14:33:10 +10:00
teor
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
juga0
6d59ab16a0
Add changes file regarding bandwidth file headers
2018-07-23 00:58:31 +00:00
rl1987
e9f6f742b2
Add changes file
2018-07-21 18:38:33 +03:00
rl1987
042d22c8d1
Split select_entry_guard_for_circuit()
2018-07-21 18:38:33 +03:00
rl1987
e6c51a056c
Make entry_guards_update_primary() shorter
2018-07-21 18:38:33 +03:00
rl1987
86549c0d9e
Split sampled_guards_update_from_consensus() into subfunctions
2018-07-21 18:38:33 +03:00
Nick Mathewson
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
Nick Mathewson
977821e59f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-20 10:42:29 -04:00
Nick Mathewson
dbf57ecf39
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-20 10:42:29 -04:00
Nick Mathewson
583df33e20
Merge branch 'maint-0.3.4'
2018-07-20 10:42:29 -04:00
Nick Mathewson
be3a962ca7
Merge branch 'ticket26647_032' into maint-0.3.2
2018-07-20 10:42:23 -04:00
Nick Mathewson
3c49019016
Merge branch 'maint-0.3.4'
2018-07-19 14:34:26 -04:00
Nick Mathewson
7260d07fee
Fix linking when dirauth module is disabled.
...
Bugfix on dcee4d4c9c
, bug not in any
released Tor.
2018-07-19 14:33:18 -04:00
Nick Mathewson
c1092e9aab
Merge remote-tracking branch 'ahf-github/bugs/26780'
2018-07-19 12:22:39 -04:00
Nick Mathewson
7253603e6b
Merge branch 'bug26712'
2018-07-19 12:20:13 -04:00
Nick Mathewson
b44fce6716
Merge branch 'maint-0.3.4'
2018-07-19 08:32:00 -04:00
Nick Mathewson
0a60a94a55
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-19 08:31:07 -04:00
Nick Mathewson
27f5bd52fe
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-19 08:31:07 -04:00
Nick Mathewson
209332e71a
Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2
2018-07-19 08:30:59 -04:00
Roger Dingledine
144fc9bef1
wrap a multi-line if body in { } before somebody gets hurt
2018-07-18 21:23:35 -04:00
Nick Mathewson
e0f99404f5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-18 16:39:25 -04:00
Nick Mathewson
d5dd500e36
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-18 16:39:25 -04:00
Nick Mathewson
312a42fc85
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-18 16:39:25 -04:00
Nick Mathewson
64af15d373
Merge branch 'maint-0.3.4'
2018-07-18 16:39:25 -04:00
Nick Mathewson
93da2cae49
Changes file for bug 26787
2018-07-18 16:39:22 -04:00
Nick Mathewson
9f615fa422
Merge branch 'maint-0.3.4'
2018-07-18 16:39:11 -04:00
Nick Mathewson
9e247ac271
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-07-18 16:39:10 -04:00
Nick Mathewson
39d3187b0d
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-07-18 16:39:10 -04:00
Nick Mathewson
78386d8cdd
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-07-18 16:39:10 -04:00
Nick Mathewson
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
Nick Mathewson
c43e81a5a3
Merge remote-tracking branch 'teor/ticket26702-atomically'
2018-07-18 16:30:11 -04:00
Nick Mathewson
42c02097db
Add two more dependencies in build.rs
2018-07-18 16:20:31 -04:00
Nick Mathewson
0c4c5eeb55
Use the "testing" variant of several C libraries in build.rs
2018-07-18 16:18:25 -04:00