7c3f87eb4b
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-25 08:01:53 -04:00
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
7a55efbd59
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-24 10:38:37 -04:00
89a3fafd49
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-24 10:38:37 -04:00
5cc3a0379e
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-24 10:38:37 -04:00
34e7dca9c9
Merge branch 'travis_distcheck_029' into maint-0.2.9
2018-04-24 10:38:19 -04:00
31e69ac222
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-24 10:37:36 -04:00
9187cdb1cd
Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2
2018-04-24 10:36:17 -04:00
3abd57fa0a
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-24 08:49:24 -04:00
d2951b381b
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-24 08:49:24 -04:00
e888634076
Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1
2018-04-24 08:49:20 -04:00
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
ecb51bf9f3
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-23 09:23:31 -04:00
1438c6c713
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-23 09:23:31 -04:00
5c3639923f
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-23 09:23:31 -04:00
9727b4c5d6
Merge branch 'bug24969_029_v2' into maint-0.2.9
2018-04-23 09:23:25 -04:00
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
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
6125133715
Add distcheck support to travis configuration.
...
Implements 25814.
2018-04-18 17:33:19 -04:00
65fd973754
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-17 10:48:18 -04:00
f0230ee38a
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-17 10:48:18 -04:00
ce8e7427b9
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-17 10:48:08 -04:00
d3ff126309
Add support for the coveralls.io coverage tool in travis config
...
Closes ticket 25818.
2018-04-16 14:42:28 -04:00
677789b680
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-16 13:48:23 -04:00
c5899d5cf3
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-16 13:48:23 -04:00
5e0fbd7006
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-16 13:48:23 -04:00
0e13ff4815
Fix an LCOV exclusion pattern in address.c
2018-04-16 13:48:21 -04:00
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
a6f21a61d1
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-10 14:26:32 -04:00
d3ac47b415
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-10 14:26:32 -04:00
db6902c235
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-10 14:26:29 -04:00
10a1969ca3
Merge remote-tracking branch 'ahf-github/bugs/24854_029_2' into maint-0.2.9
2018-04-10 14:25:57 -04:00
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
bc250fcabd
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-05 12:09:00 -04:00
124e06e85c
Merge branch 'ticket25296_032_squashed' into maint-0.3.2
2018-04-05 12:08:53 -04:00
c2d93e8a7d
PerConnBW{Rate,Burst} docs: do not say consensus param is always set
...
Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage
entries were introduced.
2018-04-05 12:08:35 -04:00
955a7f52d3
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-05 08:36:13 -04:00
df519e5de8
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-05 08:36:13 -04:00
e813116d3d
Switch Travis to stable rust
2018-04-05 08:36:09 -04:00
70bd4aae67
Merge branch 'maint-0.3.2' into release-0.3.2
2018-04-05 08:22:34 -04:00
9b10eb2d7a
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-05 08:22:34 -04:00
834eef2452
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-05 08:22:34 -04:00
b68e636b33
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-04-05 08:22:33 -04:00
1fa396b0a4
Update geoip and geoip6 to the April 3 2018 database.
2018-04-05 10:42:25 +02:00
6170f87e01
Merge branch 'maint-0.3.2' into release-0.3.2
2018-03-27 18:25:21 -04:00
0b795ce6de
Merge remote-tracking branch 'catalyst-github/bug25629-032' into maint-0.3.2
2018-03-27 18:24:59 -04:00
5e7d505850
Merge branch 'maint-0.3.1' into maint-0.3.2
...
"ours" merge to avoid earlier version of 25629 fix.
2018-03-27 18:24:37 -04:00
5acfc30876
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-27 18:23:53 -04:00
0c13a84c0d
Fix CID 1430932
...
Coverity found a null pointer reference in nodelist_add_microdesc().
This is almost certainly impossible assuming that the routerstatus_t
returned by router_get_consensus_status_by_descriptor_digest() always
corresponds to an entry in the nodelist. Fixes bug 25629.
2018-03-27 16:08:39 -05:00
4bb7d9fd12
Fix CID 1430932
...
Coverity found a null pointer reference in nodelist_add_microdesc().
This is almost certainly impossible assuming that the routerstatus_t
returned by router_get_consensus_status_by_descriptor_digest() always
corresponds to an entry in the nodelist. Fixes bug 25629.
2018-03-27 15:29:00 -05:00
Nick Mathewson
David Goulet
Alexander Færøy
Taylor Yu
Karsten Loesing