Commit Graph

24043 Commits

Author SHA1 Message Date
Nick Mathewson 4996124204 Merge branch 'maint-0.2.9' into release-0.2.9 2018-07-17 14:56:52 -04:00
teor 6dafddd05d SKIP test_keygen.sh on Windows until the underlying issue is resolved
Skip an unreliable key generation test on Windows, until the underlying
issue in bug 26076 is resolved.

Fixes bug 26830; bugfix on 0.2.7.3-rc.
2018-07-17 14:56:18 -04:00
Roger Dingledine ea21038124 bump to 0.2.9.16-dev now that the release is out 2018-07-13 16:59:41 -04:00
Roger Dingledine 645ef2e285 and bump to 0.2.9.16 for release tor-0.2.9.16 2018-07-12 17:50:19 -04:00
Roger Dingledine 2918d30d76 fold changes entries into 0.2.9.16 2018-07-12 17:48:49 -04:00
Nick Mathewson bb3f8445e3 Merge branch 'maint-0.2.9' into release-0.2.9 2018-07-12 14:32:16 -04:00
Roger Dingledine cd4795ca3e put new bridge auth Serge into place
The "Bifroest" bridge authority has been retired; the new bridge authority
is "Serge", and it is operated by George from the TorBSD project.

Closes ticket 26771.
2018-07-12 14:12:13 -04:00
Nick Mathewson 9d0c64cead Merge branch 'maint-0.2.9' into release-0.2.9 2018-07-09 10:14:43 -04:00
Nick Mathewson 8b53dfc362 Merge branch 'bug26269_029' into maint-0.2.9 2018-07-09 10:14:39 -04:00
Nick Mathewson 1905a83aab Merge branch 'maint-0.2.9' into release-0.2.9 2018-07-09 09:11:41 -04:00
Karsten Loesing 9faa28b60e Update geoip and geoip6 to the July 3 2018 database. 2018-07-06 20:54:03 +02:00
Nick Mathewson 3e1717cd0f Merge branch 'maint-0.2.9' into release-0.2.9 2018-07-03 09:48:03 -04:00
Nick Mathewson b205714ba8 Merge branch 'bug26535_029' into maint-0.2.9 2018-07-03 09:47:41 -04:00
Nick Mathewson fc5f8b6931 ntor_ref.py: pass only strings to subprocess.Popen
Recent Python3 versions seem to require this on Windows.

Fixes bug 26535; bug introduced in f4be34f70d, which
was apparently intended itself as a Python3 workaround.
2018-07-02 14:18:41 -04:00
Nick Mathewson 9fa7866c71 Merge branch 'maint-0.2.9' into release-0.2.9 2018-06-29 23:11:12 -04:00
Nick Mathewson 1953a7e61d Finally remove our EOL@EOF check.
This check was added by mistake long ago.  It will be nice to see
these EOLs disappear from our code over time.

(backport from master)
2018-06-29 23:11:02 -04:00
Nick Mathewson efc851bac6 Merge branch 'maint-0.2.9' into release-0.2.9 2018-06-29 13:49:43 -04:00
Nick Mathewson 3c0a63c40f Fix a memory error in test_shared_random
Bug not in any released Tor.
2018-06-29 13:49:02 -04:00
Nick Mathewson 0580b2ee77 Merge branch 'maint-0.2.9' into release-0.2.9 2018-06-29 13:06:15 -04:00
Nick Mathewson 890bc15ab6 Changes file for 26467 2018-06-29 13:04:29 -04:00
Nick Mathewson d02c5f739f Merge branch 'maint-0.2.9' into release-0.2.9 2018-06-29 13:00:55 -04:00
Nick Mathewson b426e83f07 Merge remote-tracking branch 'ahf-github/maint-0.2.9' into maint-0.2.9 2018-06-29 13:00:52 -04:00
Nick Mathewson e7b146736f Merge branch 'maint-0.2.9' into release-0.2.9 2018-06-26 09:21:59 -04:00
Nick Mathewson fcd26af7c0 Merge branch 'feature26372_029' into maint-0.2.9 2018-06-26 09:21:55 -04:00
Alexander Færøy 8ec6b36dca Fix memory leak in test_sr_setup_commits().
This patch fixes a memory leak in test_sr_setup_commits() where the
place_holder is allocated, but never freed again.

See: Coverity CID 1437440.
2018-06-23 13:11:03 +02:00
Alexander Færøy 3395de51a0 Fix memory leak in disk_state_parse_commits().
This patch fixes a memory leak in disk_state_parse_commits() where if
commit is NULL, we continue the internal loop, but without ever freeing
the args variable.

See: Coverity CID 1437441.
2018-06-23 13:10:57 +02:00
Alexander Færøy dcbfee246f Fix memory leak in frac_nodes_with_descriptors().
This patch fixes a memory leak in frac_nodes_with_descriptors() where
we might return without free'ing the bandwidths variable.

See: Coverity CID 1437451.
2018-06-23 13:10:29 +02:00
Alexander Færøy 1724f995c7 Fix potential memory leak in test_hs_auth_cookies().
This patch fixes a potential memory leak in test_hs_auth_cookies() if a
test-case fails and we goto the done label where no memory clean up is
done.

See: Coverity CID 1437453
2018-06-23 03:17:09 +02:00
Nick Mathewson 47ee7978fe Prefer recent Python 3 in autoconf.
Closes ticket 26372.
2018-06-21 09:31:01 -04:00
Nick Mathewson 2ef4bccb48 Merge branch 'maint-0.2.9' into release-0.2.9 2018-06-17 19:24:48 -04:00
juga0 dd69e74e3f Add .editorconfig to follow coding standards style 2018-06-17 19:24:40 -04:00
Nick Mathewson 015fcd0e11 Fix a GCC "potential null dereference" warning.
Fixes bug 26269; bugfix on c30be5a82d in 0.2.8.2-alpha
2018-06-13 10:34:53 -04:00
Nick Mathewson 75732ef4cd Merge branch 'maint-0.2.9' into release-0.2.9 2018-06-12 09:44:17 -04:00
Nick Mathewson ef671147f2 Merge branch 'dannenberg_ipv6_029' into maint-0.2.9 2018-06-12 09:44:13 -04:00
Linus Nordberg 2ef448da2f Add a changelog entry. 2018-06-12 09:44:01 -04:00
Linus Nordberg 6cf9288518 Add IPv6 orport address for dannenberg. 2018-06-12 09:44:01 -04:00
Nick Mathewson bded08415c Merge branch 'maint-0.2.9' into release-0.2.9 2018-06-12 08:11:19 -04:00
Karsten Loesing ae540569ce Update geoip and geoip6 to the June 7 2018 database. 2018-06-11 21:58:55 +02:00
Nick Mathewson 8dfd916a4b Merge branch 'maint-0.2.9' into release-0.2.9 2018-06-08 10:11:57 -04:00
rl1987 719b5c1d27 Avoid out-of-bounds smartlist access in protover_compute_vote()
and contract_protocol_list()
2018-06-08 10:11:32 -04:00
Nick Mathewson 04eacc4556 Merge branch 'maint-0.2.9' into release-0.2.9 2018-05-24 09:40:06 -04:00
Nick Mathewson c380562aed Merge branch 'bug26116_029' into maint-0.2.9 2018-05-24 09:39:46 -04:00
Nick Mathewson aeb4be1d5a Add a unit test for PEM-encrypted documents. 2018-05-24 09:36:33 -04:00
Nick Mathewson 69a6763b37 Merge branch 'maint-0.2.9' into release-0.2.9 2018-05-16 12:11:45 -04:00
Nick Mathewson d1e4ffc710 Merge branch 'bug26072_029' into maint-0.2.9 2018-05-16 12:11:40 -04:00
Nick Mathewson 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
Nick Mathewson 6ac0ec566e Merge branch 'maint-0.2.9' into release-0.2.9 2018-05-15 09:32:44 -04:00
Karsten Loesing 033e4723f3 Update geoip and geoip6 to the May 1 2018 database. 2018-05-15 15:20:09 +02:00
Nick Mathewson 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
Nick Mathewson a1c06b84b3 Merge branch 'maint-0.2.9' into release-0.2.9 2018-05-10 09:19:28 -04:00