e7b146736f
Merge branch 'maint-0.2.9' into release-0.2.9
2018-06-26 09:21:59 -04:00
fcd26af7c0
Merge branch 'feature26372_029' into maint-0.2.9
2018-06-26 09:21:55 -04:00
47ee7978fe
Prefer recent Python 3 in autoconf.
...
Closes ticket 26372.
2018-06-21 09:31:01 -04:00
2ef4bccb48
Merge branch 'maint-0.2.9' into release-0.2.9
2018-06-17 19:24:48 -04:00
dd69e74e3f
Add .editorconfig to follow coding standards style
2018-06-17 19:24:40 -04:00
75732ef4cd
Merge branch 'maint-0.2.9' into release-0.2.9
2018-06-12 09:44:17 -04:00
ef671147f2
Merge branch 'dannenberg_ipv6_029' into maint-0.2.9
2018-06-12 09:44:13 -04:00
2ef448da2f
Add a changelog entry.
2018-06-12 09:44:01 -04:00
6cf9288518
Add IPv6 orport address for dannenberg.
2018-06-12 09:44:01 -04:00
bded08415c
Merge branch 'maint-0.2.9' into release-0.2.9
2018-06-12 08:11:19 -04:00
ae540569ce
Update geoip and geoip6 to the June 7 2018 database.
2018-06-11 21:58:55 +02:00
8dfd916a4b
Merge branch 'maint-0.2.9' into release-0.2.9
2018-06-08 10:11:57 -04:00
719b5c1d27
Avoid out-of-bounds smartlist access in protover_compute_vote()
...
and contract_protocol_list()
2018-06-08 10:11:32 -04:00
04eacc4556
Merge branch 'maint-0.2.9' into release-0.2.9
2018-05-24 09:40:06 -04:00
c380562aed
Merge branch 'bug26116_029' into maint-0.2.9
2018-05-24 09:39:46 -04:00
aeb4be1d5a
Add a unit test for PEM-encrypted documents.
2018-05-24 09:36:33 -04:00
69a6763b37
Merge branch 'maint-0.2.9' into release-0.2.9
2018-05-16 12:11:45 -04:00
d1e4ffc710
Merge branch 'bug26072_029' into maint-0.2.9
2018-05-16 12:11:40 -04:00
881f7157f6
Return -1 from our PEM password callback
...
Apparently, contrary to its documentation, this is how OpenSSL now
wants us to report an error.
Fixes bug 26116; bugfix on 0.2.5.16.
2018-05-16 11:39:42 -04:00
6ac0ec566e
Merge branch 'maint-0.2.9' into release-0.2.9
2018-05-15 09:32:44 -04:00
033e4723f3
Update geoip and geoip6 to the May 1 2018 database.
2018-05-15 15:20:09 +02:00
5eb2d58880
Add a missing return after marking a stream for bad connected cell
...
Fixes bug 26072; bugfix on 0.2.4.7-alpha.
2018-05-14 15:54:48 -04:00
a1c06b84b3
Merge branch 'maint-0.2.9' into release-0.2.9
2018-05-10 09:19:28 -04:00
edb6acf9ce
Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9
2018-05-10 09:19:09 -04:00
52bb38868c
Merge branch 'maint-0.2.9' into release-0.2.9
2018-05-10 08:00:35 -04:00
bca8a104b2
Having a ControlPort open doesn't mean we are a client
...
The any_client_port_set() returns true if the ControlPort is set which is
wrong because we can have that port open but still not behave as a tor client
(like many relays for instance).
Fixes #26062
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-05-09 12:50:53 -04:00
dbdde76f56
Test read bandwidth measurements with empty file
2018-05-09 15:58:25 +00:00
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
add0306cab
Merge branch 'maint-0.2.9' into release-0.2.9
2018-05-03 13:38:54 -04:00
5227754b2f
Merge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9
2018-05-03 13:38:37 -04:00
7d509bc170
Merge branch 'maint-0.2.9' into release-0.2.9
2018-05-02 08:46:28 -04:00
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
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
edbfcee2f2
Merge branch 'maint-0.2.9' into release-0.2.9
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
2fd489d616
Merge branch 'maint-0.2.9' into release-0.2.9
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
6125133715
Add distcheck support to travis configuration.
...
Implements 25814.
2018-04-18 17:33:19 -04:00
d5000fc673
Merge branch 'maint-0.2.9' into release-0.2.9
2018-04-17 10:47:13 -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
b83991fce3
Merge branch 'maint-0.2.9' into release-0.2.9
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
5a2232e627
Merge branch 'maint-0.2.9' into release-0.2.9
2018-04-10 14:26:01 -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
8a363a7c84
Merge branch 'maint-0.2.9' into release-0.2.9
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
c26fa05370
Merge branch 'maint-0.2.9' into release-0.2.9
2018-03-27 18:23:53 -04:00
Nick Mathewson
juga0
Linus Nordberg
Karsten Loesing
rl1987
David Goulet
teor
Taylor Yu
Alexander Færøy