Nick Mathewson
394f102ea6
Merge remote-tracking branch 'asn-github/bug25761_032' into maint-0.3.2
2018-05-09 11:53:15 -04:00
teor
867fe40f91
Stop logging stack contents when reading a zero-length bandwidth file
...
When directory authorities read a zero-byte bandwidth file, they log
a warning with the contents of an uninitialised buffer. Log a warning
about the empty file instead.
Fixes bug 26007; bugfix on 0.2.2.1-alpha.
2018-05-09 15:19:28 +00:00
George Kadianakis
7e8c5e3662
Detect when v3 services get disabled after HUP.
...
Remove v3 optimization which made Tor not detect disabling services.
This optimization is not so needed because we only call that function after HUP
anyway.
Fixes bug #25761 .
2018-05-09 11:25:00 +03:00
George Kadianakis
5dc00c0661
Detect when v2 services get disabled after HUP.
...
During service configuration, rend_service_prune_list_impl_() sets
rend_service_staging_list to NULL, which blocked pruning after a HUP.
This patch initializes rend_service_staging_list when needed, so that HUP can
detect disabled onion services.
Fixes bug #25761 .
2018-05-09 11:25:00 +03:00
Nick Mathewson
6361a250f0
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-03 13:38:54 -04:00
Nick Mathewson
a1243864f2
Merge branch 'maint-0.3.2' into release-0.3.2
2018-05-03 13:38:54 -04:00
Nick Mathewson
be5b4415c2
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-03 13:38:54 -04:00
Nick Mathewson
726f238b72
Merge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1
2018-05-03 13:38:46 -04:00
Nick Mathewson
5227754b2f
Merge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9
2018-05-03 13:38:37 -04:00
Nick Mathewson
4b14ff45fd
Merge branch 'maint-0.3.2' into release-0.3.2
2018-05-02 08:46:28 -04:00
Nick Mathewson
246765342e
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-02 08:46:28 -04:00
Nick Mathewson
993e314c6f
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-02 08:46:28 -04:00
teor
d465bd27ed
Stop logging stack contents when reading a zero-length bandwidth file
...
When directory authorities read a zero-byte bandwidth file, they log
a warning with the contents of an uninitialised buffer. Log a warning
about the empty file instead.
Fixes bug 26007; bugfix on 0.2.2.1-alpha.
2018-05-02 22:36:23 +10:00
Taylor Yu
5982105098
Merge branch 'bug25936-029' into bug25936-031
2018-04-26 15:46:57 -05:00
Taylor Yu
31865b5029
Show test-suite.log for distcheck on Travis CI
...
When Travis CI runs make distcheck, test-suite.log doesn't exist in
the expected place. Add a new make target to show this file and use
it when DISTCHECK=yes in .travis.yml. Fixes bug 25814; bug not in any
released Tor.
2018-04-26 15:35:47 -05:00
Nick Mathewson
fb4307bf22
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-25 08:01:54 -04:00
Nick Mathewson
7c3f87eb4b
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-25 08:01:53 -04:00
Nick Mathewson
bb35405d2a
Fix a copy-paste error in the fix for #23693 .
...
Found by coverity; CID 25912; bug not in any released Tor.
2018-04-25 08:00:55 -04:00
Nick Mathewson
7a55efbd59
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-24 10:38:37 -04:00
Nick Mathewson
89a3fafd49
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-24 10:38:37 -04:00
Nick Mathewson
5cc3a0379e
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-24 10:38:37 -04:00
Nick Mathewson
34e7dca9c9
Merge branch 'travis_distcheck_029' into maint-0.2.9
2018-04-24 10:38:19 -04:00
Nick Mathewson
31e69ac222
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-24 10:37:36 -04:00
Nick Mathewson
9187cdb1cd
Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2
2018-04-24 10:36:17 -04:00
Nick Mathewson
3abd57fa0a
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-24 08:49:24 -04:00
Nick Mathewson
d2951b381b
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-24 08:49:24 -04:00
Nick Mathewson
e888634076
Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1
2018-04-24 08:49:20 -04:00
David Goulet
b259008c56
hs: Fix memleak in v3 on SIGHUP
...
Fixes #25901
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-23 11:09:57 -04:00
Nick Mathewson
ecb51bf9f3
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-23 09:23:31 -04:00
Nick Mathewson
1438c6c713
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-23 09:23:31 -04:00
Nick Mathewson
5c3639923f
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-23 09:23:31 -04:00
Nick Mathewson
9727b4c5d6
Merge branch 'bug24969_029_v2' into maint-0.2.9
2018-04-23 09:23:25 -04:00
Nick Mathewson
c4be6dfeab
Permit the nanosleep system call in the seccomp2 callbox
...
Fixes bug 24969; bugfix on 0.2.5.1-alpha when the sandbox was introduced.
2018-04-23 09:15:40 -04:00
Nick Mathewson
c3e40a8361
Allow cpuworkers to exist without onion keys
...
Now that we allow cpuworkers for dirport-only hosts (to fix 23693),
we need to allow dup_onion_keys() to succeed for them.
The change to construct_ntor_key_map() is for correctness,
but is not strictly necessary.
2018-04-22 17:17:07 -04:00
Nick Mathewson
6125133715
Add distcheck support to travis configuration.
...
Implements 25814.
2018-04-18 17:33:19 -04:00
Nick Mathewson
65fd973754
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-17 10:48:18 -04:00
Nick Mathewson
f0230ee38a
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-17 10:48:18 -04:00
Nick Mathewson
ce8e7427b9
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-17 10:48:08 -04:00
Nick Mathewson
d3ff126309
Add support for the coveralls.io coverage tool in travis config
...
Closes ticket 25818.
2018-04-16 14:42:28 -04:00
Nick Mathewson
677789b680
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-16 13:48:23 -04:00
Nick Mathewson
c5899d5cf3
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-16 13:48:23 -04:00
Nick Mathewson
5e0fbd7006
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-16 13:48:23 -04:00
Nick Mathewson
0e13ff4815
Fix an LCOV exclusion pattern in address.c
2018-04-16 13:48:21 -04:00
Nick Mathewson
386f8016b7
Fix another crash-on-no-threadpool bug.
...
This one happens if for some reason you start with DirPort enabled
but server mode turned off entirely.
Fixes a case of bug 23693; bugfix on 0.3.1.1-alpha.
2018-04-10 14:44:38 -04:00
Nick Mathewson
a6f21a61d1
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-10 14:26:32 -04:00
Nick Mathewson
d3ac47b415
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-10 14:26:32 -04:00
Nick Mathewson
db6902c235
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-10 14:26:29 -04:00
Nick Mathewson
10a1969ca3
Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9
2018-04-10 14:25:57 -04:00
Alexander Færøy
1295044dc8
Lift the list of default directory servers into their own file.
...
This patch lifts the list of default directory authorities from config.c
into their own auth_dirs.inc file, which is then included in config.c
using the C preprocessor.
Patch by beastr0.
See: https://bugs.torproject.org/24854
2018-04-09 16:00:26 +02:00
Nick Mathewson
bc250fcabd
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-05 12:09:00 -04:00