torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
23,280 Commits 53 Branches 631 Tags
b77bc9a1bb67c8229ada985619a088e5a78359fd
Commit Graph

4640 Commits

Author SHA1 Message Date
Nick Mathewson b77bc9a1bb Merge branch 'maint-0.2.9' into release-0.2.9 2016-12-23 11:04:18 -05:00
Nick Mathewson 2f589e1057 Use event_base_new(), not event_init(), to detect libevent 2. 
(event_init() is obsoleted in libevent 2.)

Fixes bug 21051; bugfix on 0.2.9.1-alpha when we dropped libevent 1
support.
 2016-12-23 08:18:31 -05:00
Nick Mathewson 99513f763c Merge branch 'maint-0.2.9' into release-0.2.9 2016-12-23 08:08:19 -05:00
Nick Mathewson aaeb50b2f3 changes file for 21035. 2016-12-23 08:08:14 -05:00
Nick Mathewson dab16f3a04 0.2.9.8 changelog and releasenotes 2016-12-19 08:20:07 -05:00
Nick Mathewson 054c1d5650 Merge branch 'maint-0.2.9' into release-0.2.9 2016-12-19 07:59:18 -05:00
Nick Mathewson de65647461 Merge branch 'maint-0.2.8' into maint-0.2.9 2016-12-19 07:58:43 -05:00
Nick Mathewson c11de4c45f Merge branch 'bug21018_024' into maint-0.2.8 2016-12-19 07:58:21 -05:00
Nick Mathewson b83a5ee11f Merge branch 'maint-0.2.9' into release-0.2.9 2016-12-19 07:30:55 -05:00
Nick Mathewson 169a93fff2 Merge branch 'maint-0.2.8' into maint-0.2.9 2016-12-19 07:30:42 -05:00
Nick Mathewson e0306320b5 Merge remote-tracking branch 'teor/new-fallbacks-028-20161219' into maint-0.2.8 2016-12-19 07:27:39 -05:00
teor 4181e812c7 Update the fallback directory mirror list in December 2016 
Replace the 81 remaining fallbacks of the 100 originally introduced
in Tor 0.2.8.3-alpha in March 2016, with a list of 177 fallbacks
(123 new, 54 existing, 27 removed) generated in December 2016.

Resolves ticket 20170.
 2016-12-19 15:44:20 +11:00
Nick Mathewson d978216dea Fix parsing bug with unecognized token at EOS 
In get_token(), we could read one byte past the end of the
region. This is only a big problem in the case where the region
itself is (a) potentially hostile, and (b) not explicitly
nul-terminated.

This patch fixes the underlying bug, and also makes sure that the
one remaining case of not-NUL-terminated potentially hostile data
gets NUL-terminated.

Fix for bug 21018, TROVE-2016-12-002, and CVE-2016-1254
 2016-12-18 20:17:24 -05:00
Nick Mathewson 6b6ad81c2e fold 20935 into 0.2.9.7-rc changelog 2016-12-11 22:23:26 -05:00
Nick Mathewson c80b7186bc Merge branch 'maint-0.2.9' into release-0.2.9 2016-12-11 22:22:35 -05:00
Nick Mathewson ef53526b10 Spell MAC_OS_X_VERSION_10_12 correctly. 
Fixes 20935.
 2016-12-11 22:17:14 -05:00
Nick Mathewson 0a0fe51a2a Begin a changelog for 0.2.9.7-rc 2016-12-11 21:33:19 -05:00
Nick Mathewson d3874e4cbc Merge branch 'maint-0.2.9' into release-0.2.9 2016-12-11 20:37:02 -05:00
Nick Mathewson a40d212383 Downgrade a harmless bug warning to info. 
Makes 19926 less annoying in 0.2.9.  In 0.3.0, we should actually
fix this.
 2016-12-09 08:43:09 -05:00
Nick Mathewson 6402144099 Merge branch 'maint-0.2.9' into release-0.2.9 2016-12-09 08:35:10 -05:00
Nick Mathewson adaf6a422a Merge branch 'maint-0.2.8' into maint-0.2.9 2016-12-09 08:34:24 -05:00
Nick Mathewson 56a2b8dc6e Merge branch 'maint-0.2.7' into maint-0.2.8 2016-12-09 08:34:18 -05:00
Nick Mathewson b49369badd Merge branch 'maint-0.2.6' into maint-0.2.7 2016-12-09 08:34:12 -05:00
Nick Mathewson 3d9f8ff6a5 Merge branch 'maint-0.2.5' into maint-0.2.6 2016-12-09 08:34:06 -05:00
Nick Mathewson 3d2d3f2b62 Merge branch 'maint-0.2.4' into maint-0.2.5 2016-12-09 08:33:57 -05:00
Nick Mathewson 8efa933da9 Merge branch 'maint-0.2.9' into release-0.2.9 2016-12-09 08:31:03 -05:00
David Goulet 9bb3bcbc41 router: Fix memory leak in signed_descriptor_move() 
The signed_descriptor_move() was not releasing memory inside the destination
object before overwriting it with the source object. This commit adds a reset
function that free that memory inside a signed descriptor object and zero it.

Closes #20715.

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2016-12-09 08:30:46 -05:00
Karsten Loesing 9db47e7921 Update geoip and geoip6 to the December 7 2016 database. 2016-12-09 10:23:36 +01:00
Nick Mathewson 669d79d2d6 Merge branch 'maint-0.2.9' into release-0.2.9 2016-12-08 07:49:44 -05:00
Nick Mathewson 53d4e89626 Netbsd doesn't have ipfw, only the regular pf transport stuff. 
Attempted fix for 19960.

Also, fixes a typo.
 2016-12-07 15:22:44 -05:00
Nick Mathewson c8bcbf5ac2 Merge branch 'maint-0.2.9' into release-0.2.9 2016-12-07 11:14:46 -05:00
Nick Mathewson 0815f96416 Fix a BUG() warning from next_random_exponential_delay(). 
Fixes 20875; this code is as suggested by teor on the ticket.  Thanks!
 2016-12-07 11:13:11 -05:00
Nick Mathewson 78cb55e42f Merge branch 'maint-0.2.9' into release-0.2.9 2016-12-07 11:09:23 -05:00
Nick Mathewson fce425e3ff Increase tolerances in util/monotonic_time tests 
This is an attempt to fix #19974.
 2016-12-07 11:08:54 -05:00
Nick Mathewson 9b37d540b0 Merge branch 'maint-0.2.9' into release-0.2.9 2016-12-07 10:52:21 -05:00
Nick Mathewson d6ca36defa Merge branch 'bug20710_025' into maint-0.2.9 2016-12-07 10:52:12 -05:00
Nick Mathewson 045a50e45a Forgot to add changes file for 20710. 2016-12-07 10:51:39 -05:00
Nick Mathewson cc34ba1cec Merge branch 'getentropy_028' into maint-0.2.8 2016-12-05 10:06:16 -05:00
Nick Mathewson 714aeedc52 20865: Don't use getentropy() on OSX Sierra. 
Tor 0.2.9 has a broader range of fixes and workarounds here, but for
0.2.8, we're just going to maintain the existing behavior.

(The alternative would be to backport both
1eba088054 and
16fcbd21c9 , but the latter is kind of
a subtle kludge in the configure.ac script, and I'm not a fan of
backporting that kind of thing.)
 2016-12-05 10:02:33 -05:00
Nick Mathewson 5032489e80 Merge branch 'maint-0.2.9' into release-0.2.9 2016-12-05 08:21:40 -05:00
J. Ryan Stinnett cf2f36b8b4 Test for .git as readable instead of a dir to support worktrees 
Fixes #20492.
 2016-12-05 08:21:17 -05:00
Nick Mathewson b4c648c6c0 Merge branch 'maint-0.2.9' into release-0.2.9 2016-12-05 08:13:09 -05:00
Nick Mathewson 42ec60ecfb Fix changes file for 20864: 20638 _did_ get into 0.2.9 2016-12-05 08:12:10 -05:00
Nick Mathewson 2a365413eb Always Use EVP_aes_*_ctr() with openssl 1.1 
(OpenSSL 1.1 makes EVP_CIPHER_CTX opaque, _and_ adds acceleration
for counter mode on more architectures.  So it won't work if we try
the older approach, and it might help if we try the newer one.)

Fixes bug 20588.
 2016-12-05 07:54:22 -05:00
teor ebf243bc5b Changes file for 20864 2016-12-03 06:35:45 +11:00
Nick Mathewson 567852fcde Merge branch 'maint-0.2.9' into release-0.2.9 2016-12-02 12:10:33 -05:00
David Goulet 907cd8a0cf protover: Fix old tor hardcoded version check 
When computing old Tor protocol line version in protover, we were looking at
0.2.7.5 twice instead of the specific case for 0.2.9.1-alpha.

Fixes #20810

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2016-12-02 12:09:08 -05:00
Nick Mathewson ef7df10972 Merge branch 'maint-0.2.9' into release-0.2.9 2016-12-02 12:01:00 -05:00
Nick Mathewson 8b93cbc16d Merge branch 'bug20716_026' into maint-0.2.9 2016-12-02 12:00:46 -05:00
Nick Mathewson 8b51565314 Start 0.2.9.6-rc changelog 2016-12-01 12:55:06 -05:00