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
30,761 Commits 53 Branches 631 Tags
9beb085c10562a257c08abcee43434533d4fa96e
Commit Graph
30761 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Roger Dingledine 9beb085c10 mark #27841 as major tor-0.3.5.7 2019-01-07 12:41:02 -05:00
Nick Mathewson fb2af84a3f Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-07 10:23:40 -05:00
Nick Mathewson 52b508735f Bump version to 0.3.5.7 2019-01-07 10:23:21 -05:00
Nick Mathewson d51595ec57 Merge branch 'maint-0.3.4' into maint-0.3.5 
"ours" to avoid version bump.
 2019-01-07 10:22:47 -05:00
Nick Mathewson ea47563dd7 Bump to 0.3.4.10 2019-01-07 10:22:42 -05:00
Nick Mathewson d8196dc200 Merge branch 'maint-0.3.3' into maint-0.3.4 
"ours" merge to avoid version bump.
 2019-01-07 10:22:13 -05:00
Nick Mathewson 63eed6edff Bump to 0.3.3.11 2019-01-07 10:21:59 -05:00
Nick Mathewson 75dd7f0210 Write a releasenotes file for 0.3.5.7 2019-01-07 09:52:16 -05:00
Nick Mathewson 7e9a223264 Add a paragraph about compatibility, and one about LTS 2019-01-07 09:32:29 -05:00
Nick Mathewson 09f8394616 Minor spelling tweak. 2019-01-07 09:22:26 -05:00
Nick Mathewson f0faee0677 Add geoip entry to 0.3.5.7 changelog 2019-01-07 09:09:50 -05:00
Nick Mathewson 85c5f58509 Merge branch 'maint-0.3.4' into maint-0.3.5 2019-01-07 08:43:46 -05:00
Nick Mathewson cd9a85a522 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-07 08:43:46 -05:00
Nick Mathewson 3d18903f53 Merge branch 'maint-0.3.3' into maint-0.3.4 2019-01-07 08:43:45 -05:00
Nick Mathewson ba71b17865 Merge branch 'maint-0.2.9' into maint-0.3.3 2019-01-07 08:43:45 -05:00
Karsten Loesing 445d6750f7 Update geoip and geoip6 to the January 3 2019 database. 2019-01-07 09:00:29 +01:00
Nick Mathewson cd446a6fde 0.3.5.7 blurb 2019-01-04 15:13:32 -05:00
Nick Mathewson 74bda3079c Merge branch 'maint-0.3.4' into maint-0.3.5 2019-01-04 15:04:58 -05:00
Nick Mathewson d7259b64d4 Merge branch 'maint-0.3.3' into maint-0.3.4 2019-01-04 15:04:58 -05:00
Nick Mathewson fee2eaf2d4 Merge branch 'maint-0.2.9' into maint-0.3.3 2019-01-04 15:04:58 -05:00
Nick Mathewson 9cdb7a33c8 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-04 15:04:58 -05:00
Nick Mathewson 73de7b4bcb Merge branch 'bug21394_029_redux' into maint-0.2.9 2019-01-04 15:04:54 -05:00
Nick Mathewson 54049cb6f4 Start an 0.3.5.7 changelog 2019-01-04 15:03:01 -05:00
Nick Mathewson 16deb1f5f2 Merge branch 'maint-0.3.4' into maint-0.3.5 2019-01-04 14:57:06 -05:00
Nick Mathewson fe3331b845 Merge branch 'maint-0.3.3' into maint-0.3.4 2019-01-04 14:57:06 -05:00
Nick Mathewson f82fa3bb64 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-04 14:57:06 -05:00
Nick Mathewson bf8bb9c526 Merge remote-tracking branch 'dgoulet/ticket28619_033_01' into maint-0.3.3 2019-01-04 14:49:16 -05:00
Nick Mathewson fa05efdf8b Merge branch 'maint-0.3.4' into maint-0.3.5 2019-01-04 14:36:02 -05:00
Nick Mathewson e0312bf39c Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-04 14:36:02 -05:00
Nick Mathewson d47c9276de Merge branch 'ticket27750_034_01_squashed' into maint-0.3.4 2019-01-04 14:34:38 -05:00
Nick Mathewson 0644368009 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-03 21:34:43 -05:00
Nick Mathewson c75cf802d3 Merge branch 'ticket28879' into maint-0.3.5 2019-01-03 21:34:35 -05:00
Nick Mathewson 3ef8d4fb19 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-03 09:45:56 -05:00
Nick Mathewson abdc6aede2 Merge branch 'ticket28851_035_squashed' into maint-0.3.5 2019-01-03 09:45:53 -05:00
Nick Mathewson b82717b273 Stop re-checking our hardcoded dh parameters on every startup 
Closes ticket 28851.
 2019-01-03 09:45:43 -05:00
Nick Mathewson aeb3f46097 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-03 09:44:15 -05:00
Nick Mathewson 98736cf36a Merge remote-tracking branch 'public/ticket28838_035' into maint-0.3.5 2019-01-03 09:44:10 -05:00
Nick Mathewson 55474b9d99 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-03 09:02:40 -05:00
Nick Mathewson 3e64553f76 Merge branch 'maint-0.3.3' into maint-0.3.4 2019-01-03 09:02:39 -05:00
Nick Mathewson ed62f0fa15 Merge branch 'maint-0.3.4' into maint-0.3.5 2019-01-03 09:02:39 -05:00
Nick Mathewson 1ea3127188 Merge branch 'ticket28973_033_squashed' into maint-0.3.3 2019-01-03 09:01:40 -05:00
Nick Mathewson bf413829cb Detect openssl bug 7712 and work around it. 
In theory it would be better to detect this bug in advance, but this
approach is much simpler, and therefore safer to backport.

This closes tor issue 28973.
 2019-01-03 09:00:47 -05:00
Nick Mathewson 0d51da0a14 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-02 16:15:39 -05:00
Nick Mathewson 98755cbddf Merge branch 'bug28974_035' into maint-0.3.5 2019-01-02 16:15:34 -05:00
Nick Mathewson 9eb2da6b52 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-02 16:09:14 -05:00
Nick Mathewson a4b86421d2 ticket 28924 deserves a changes file. I made one, but I guess I forgot to git add 2019-01-02 16:09:10 -05:00
Nick Mathewson b33bcb1e63 Add an errno.h include to freespace.c to fix bug 28974. 2019-01-02 15:19:52 -05:00
Nick Mathewson f4874765ea Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-21 15:42:58 -05:00
Nick Mathewson a9eec33649 Merge branch 'maint-0.3.4' into maint-0.3.5 2018-12-21 15:42:57 -05:00
Nick Mathewson 1ef2ce9f2f Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-21 11:30:31 -05:00