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
28,156 Commits 53 Branches 631 Tags
7b7b817c3ef68d7272ceec2ea0bdbd04684ae5dd
Commit Graph

28156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 7b7b817c3e changelog for 0.3.3.7 2018-06-12 08:56:05 -04:00
Nick Mathewson 9ff769c492 Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-12 08:18:56 -04:00
Nick Mathewson 7fff99110b Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-12 08:18:56 -04:00
Nick Mathewson 5d8a927aa3 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-12 08:18:56 -04:00
Nick Mathewson d84581a3e6 Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1 2018-06-12 08:18:53 -04:00
Nick Mathewson 3cca9a103d Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-12 08:11:20 -04:00
Nick Mathewson 6dca180ae9 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-12 08:11:20 -04:00
Nick Mathewson 74ac463e7f Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-12 08:11:20 -04:00
Nick Mathewson 19f3868523 Merge branch 'maint-0.2.9' into maint-0.3.1 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 79c56a6e31 Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-08 10:12:57 -04:00
Nick Mathewson a141127435 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-06-08 10:12:57 -04:00
Nick Mathewson dd63033fcb Merge branch 'maint-0.3.1' into maint-0.3.2 2018-06-08 10:11:57 -04:00
Nick Mathewson 1ef8023e00 Merge branch 'maint-0.2.9' into maint-0.3.1 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
teor 8366be3b51 Silence unused-const-variable warnings in zstd.h on some gcc versions 
Fixes bug 26272; bugfix on 0.3.1.1-alpha.
 2018-06-02 14:11:04 -07:00
Nick Mathewson 0c9d617762 Merge branch 'maint-0.3.3' into release-0.3.3 2018-06-02 10:42:06 -07:00
Nick Mathewson f15f90e2ca Merge branch 'bug26121-033-squashed' into maint-0.3.3 2018-06-02 10:36:44 -07:00
Mike Perry fe5764012a Bug 26121: Improve BUILDTIMEOUT_SET accuracy. 
We were miscounting the total number of circuits for the TIMEOUT_RATE and
CLOSE_RATE fields of this event.
 2018-06-02 10:36:36 -07:00
Nick Mathewson db9ca07c46 Merge branch 'maint-0.3.3' into release-0.3.3 2018-05-27 10:04:42 -04:00
Nick Mathewson fa1890e97f Merge remote-tracking branch 'public/bug25691_033_again_squashed' into maint-0.3.3 2018-05-27 10:03:11 -04:00
Nick Mathewson 3f3739c6e0 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-05-24 09:40:06 -04:00
Nick Mathewson f48fb8a720 Merge branch 'maint-0.2.9' into maint-0.3.1 2018-05-24 09:40:06 -04:00
Nick Mathewson c8dad04924 Merge branch 'maint-0.3.3' into release-0.3.3 2018-05-24 09:40:06 -04:00
Nick Mathewson 0ef432d457 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-05-24 09:40:06 -04:00
Nick Mathewson c000763f1e Merge branch 'bug26116_033' into maint-0.3.3 2018-05-24 09:40:00 -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 c11c851b39 Merge branch 'maint-0.3.3' into release-0.3.3 2018-05-22 18:05:55 -04:00
Nick Mathewson ff27b7ce60 Update version to 0.3.3.6-dev 2018-05-22 18:05:28 -04:00
Roger Dingledine 7dd0813e78 and put those in the release notes too tor-0.3.3.6 2018-05-22 16:14:39 -04:00
Roger Dingledine 6a7d650b37 0.3.1.10 and 0.2.9.15 changelogs got left out too 2018-05-22 16:13:29 -04:00
Roger Dingledine 568cb0ee8f run nickm's format_changelog.py script 2018-05-22 15:51:54 -04:00
Roger Dingledine 35956bce49 a few more changelog fixes 2018-05-22 15:47:18 -04:00
Roger Dingledine 78fcfc7bcd light cleanup, give them new blurbs 2018-05-22 15:03:00 -04:00
Roger Dingledine 37b7eadb57 include 0.3.2.10 blurbs in 0.3.3 changelogs 
so they aren't mysteriously missing from the tarballs/etc
 2018-05-22 14:29:26 -04:00
Roger Dingledine 00e7e324d1 remove items from 0.3.3.6 that are already in 0.3.2.10 2018-05-22 14:22:51 -04:00
Nick Mathewson 67da2d9411 Merge branch 'maint-0.3.3' into release-0.3.3 2018-05-22 14:13:28 -04:00
Nick Mathewson 80d673ccea Merge branch 'trove-2018-005_032' into maint-0.3.3 2018-05-22 14:13:23 -04:00
Nick Mathewson 7483aef896 avoid a signed/unsigned comparison. 2018-05-22 14:12:44 -04:00
Nick Mathewson 0256702362 Merge branch 'maint-0.3.3' into release-0.3.3 2018-05-22 13:35:33 -04:00
Nick Mathewson a5d4ce2b39 Make the TROVE-2018-005 fix work with rust. 2018-05-22 13:35:20 -04:00
Nick Mathewson 20f8fead9c Merge branch 'maint-0.3.3' into release-0.3.3 2018-05-22 12:54:31 -04:00
Nick Mathewson 6e8e005b53 Merge branch 'trove-2018-005_032' into maint-0.3.3 2018-05-22 12:54:26 -04:00
Nick Mathewson 240bb17714 uint breaks compilation on windows 2018-05-22 12:54:05 -04:00
Nick Mathewson 0b8de7b3c3 Merge branch 'maint-0.3.3' into release-0.3.3 2018-05-22 12:40:27 -04:00
Nick Mathewson 074b182baa version bump to 0.3.3.6 2018-05-22 12:40:18 -04:00
Nick Mathewson b6a88173bb add TROVE-2018-005 to changelog and releasenotes 2018-05-22 12:37:49 -04:00
Nick Mathewson f177ec2142 Merge branch 'maint-0.3.3' into release-0.3.3 2018-05-22 12:33:54 -04:00
Isis Lovecruft 569b4e57e2 rust: Mirror TROVE-2018-005 fix in Rust protover implementation. 
* REFACTORS `UnvalidatedProtoEntry::from_str` to place the bulk of the
   splitting/parsing logic in to a new
   `UnvalidatedProtoEntry::parse_protocol_and_version_str()` method (so that
   both `from_str()` and `from_str_any_len()` can call it.)
 * ADD a new `UnvalidatedProtoEntry::from_str_any_len()` method in order to
   maintain compatibility with consensus methods older than 29.
 * ADD a limit on the number of characters in a protocol name.
 * FIXES part of #25517: https://bugs.torproject.org/25517
 2018-05-22 12:27:25 -04:00