b4f20ec8a6
Merge remote-tracking branch 'tor-github/pr/280'
2018-09-12 16:13:23 -04:00
4fa46fca8e
fixup! changes file
2018-09-12 14:22:31 +00:00
0aec613a78
Add an --enable-pic option for people who hack Tor into libraries
...
Closes ticket 23846
2018-09-12 10:10:29 -04:00
ab91302fd0
nodelist: use strcmpstart() instead of strncmp()
...
in rend_parse_v2_service_descriptor.
Fix on c58675ca72
2018-09-12 14:03:06 +00:00
19dbc385d5
Merge remote-tracking branch 'tor-github/pr/298'
2018-09-12 09:38:52 -04:00
62743912bc
Merge branch 'pr278_squashed'
2018-09-12 09:06:35 -04:00
c9c16ee8a4
Add changes file
2018-09-12 09:06:16 -04:00
73a37d1e54
Check waitpid return value and exit status in tinytest.c
...
It's possible for a unit test to report success via its pipe, but to
fail as it tries to clean up and exit. Notably, this happens on a
leak sanitizer failure.
Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was
introduced.
2018-09-12 08:57:18 -04:00
0dbd4fe309
Merge branch 'maint-0.3.4'
2018-09-12 08:17:45 -04:00
73ba308d3d
Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4
2018-09-12 08:17:42 -04:00
8294c40c96
Merge remote-tracking branch 'tor-github/pr/318'
2018-09-12 08:12:19 -04:00
03c4d0ab9c
rust/protover: fix check for overlapping ranges
...
Closes ticket 27649. Bugfix on e6625113c9
2018-09-12 02:47:59 +00:00
5a2374b074
Merge remote-tracking branch 'tor-github/pr/315'
2018-09-11 15:55:30 -04:00
affbe376f9
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-11 15:53:06 -04:00
ae1aea4cc4
Bug 25505: Check circuitmux queues before padding.
2018-09-11 15:53:03 -04:00
2d0a6d7691
Merge remote-tracking branch 'mikeperry/bug25505'
2018-09-11 14:32:39 -04:00
7852499812
Merge remote-tracking branch 'tor-github/pr/312'
2018-09-11 14:05:16 -04:00
042a9fd8b0
Merge branch 'maint-0.3.4'
2018-09-11 13:09:21 -04:00
46bccc50e5
Merge remote-tracking branch 'teor/ticket27252-034' into maint-0.3.4
2018-09-11 13:09:18 -04:00
8e714d2a02
Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3
2018-09-11 13:09:09 -04:00
c3a750486c
Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2
2018-09-11 13:09:04 -04:00
198b6354e6
Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
2018-09-11 13:08:57 -04:00
8a873a5695
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-11 12:04:56 -04:00
8afc100cb5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-11 12:04:56 -04:00
f741505642
Merge branch 'maint-0.3.4'
2018-09-11 12:04:56 -04:00
3119cb5062
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-11 12:04:55 -04:00
81a5448c18
Changes file for feature27244
2018-09-11 11:54:37 -04:00
19429fac23
Update geoip and geoip6 to the September 6 2018 database.
2018-09-11 09:26:59 +02:00
617160895c
Defer reporting directory bootstrap progress
...
Existing cached directory information can cause misleadingly high
bootstrap percentages. To improve user experience, defer reporting of
directory information progress until at least one connection has
succeeded to a relay or bridge.
Closes ticket 27169.
2018-09-10 15:20:50 -05:00
1e296bc6de
Call event_set_mem_functions during initialization
2018-09-09 18:58:03 +03:00
33a0c619a8
Do not store cached_dir_t for consensus in RAM if not a dircache.
...
There are three reasons we use a cached_dir_t to hold a consensus:
1. to serve that consensus to a client
2. to apply a consensus diff to an existing consensus
3. to send the consensus to a controller.
But case 1 is dircache-only. Case 2 and case 3 both fall back to
networkstatus_read_cached_consensus(). So there's no reason for us
to store this as a client. Avoiding this saves about 23% of our RAM
usage, according to our experiments last month.
This is, semantically, a partial revert of e5c608e535
2018-09-07 19:48:56 -04:00
859d744eb8
in master, remove changes files for already-merged changes
2018-09-07 09:39:54 -04:00
732ea9120c
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 09:15:56 -04:00
8849b2ca3c
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-07 09:15:56 -04:00
ee6d8bcf71
Merge branch 'maint-0.3.4'
2018-09-07 09:15:56 -04:00
0366ae224c
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-07 09:15:52 -04:00
2ec88a2a6d
Tell openssl to build its TLS contexts with security level 1
...
Fixes bug 27344, where we'd break compatibility with old tors by
rejecting RSA1024 and DH1024.
2018-09-07 09:15:06 -04:00
291876be36
Merge branch 'maint-0.3.4'
2018-09-07 08:48:23 -04:00
967cef2f8f
Merge remote-tracking branch 'teor/bug27460-034' into maint-0.3.4
2018-09-07 08:48:19 -04:00
579770b706
Merge branch 'maint-0.3.4'
2018-09-07 08:46:46 -04:00
056003d602
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 08:46:45 -04:00
a78504dbe6
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-07 08:46:45 -04:00
eacaff6ccc
Merge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2
2018-09-07 08:46:41 -04:00
9fcb3ef787
Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9
2018-09-07 08:46:35 -04:00
7e91eb83d8
Merge branch 'maint-0.3.4'
2018-09-07 08:45:10 -04:00
df18cf0e8f
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 08:44:40 -04:00
a4930de5e9
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-07 08:44:40 -04:00
a5ed62f96c
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-07 08:44:39 -04:00
912ae2b8dc
Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9
2018-09-07 08:44:36 -04:00
08d5fd39d8
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 08:42:19 -04:00
Nick Mathewson
cypherpunks
rl1987
Mike Perry
Karsten Loesing
Taylor Yu