12320e7f3e
Merge remote-tracking branch 'neel/b21530'
2018-09-14 09:27:03 -04:00
84e3ada71b
Merge remote-tracking branch 'onionk/rust-protokeyword1-035'
2018-09-14 09:25:31 -04:00
bb012d7941
Merge remote-tracking branch 'tor-github/pr/329'
2018-09-14 09:22:23 -04:00
b67f3b751a
Merge branch 'ticket27247'
2018-09-14 09:14:12 -04:00
bf9dc697fa
Merge branch 'rust-protokeyword1-034' into rust-protokeyword1-035
2018-09-14 02:33:59 +00:00
574d59c640
Merge branch 'rust-protokeyword1' into rust-protokeyword1-034
2018-09-14 02:26:31 +00:00
b943721b2a
Merge branch 'bug27224_take2_squashed'
2018-09-13 16:43:06 -04:00
1e77376e1a
Avoid calling node_get_all_orports() from node_is_a_configured_bridge()
...
All node_get_all_orports() does is allocate and return a smartlist
with at most two tor_addr_port_t members that match ORPort's of
node configuration. This is harmful for memory efficiency, as it
allocates the same stuff every time it is called. However,
node_is_a_configured_bridge() does not need to call it, as it
already has all the information to check if there is configured
bridge for a given node.
The new code is arranged in a way that hopefully makes each succeeding
linear search through bridge_list less likely.
2018-09-13 16:38:33 -04:00
eaf7d16826
Merge branch 'ticket23846'
2018-09-13 14:51:21 -04:00
85aba48a66
Merge branch 'bug26470_032'
2018-09-13 13:53:42 -04:00
e86593c40d
Ticket #27678 : Changes file.
2018-09-13 17:46:11 +00:00
3adef11d10
Changes file for 27186
2018-09-13 13:37:29 -04:00
787da5185c
Merge remote-tracking branch 'onionk/strcmpstart1'
2018-09-13 13:30:53 -04:00
7c26f88fd7
rust/protover: validate unknown protocol names use only allowed characters
2018-09-13 16:33:58 +00:00
db27a70c94
Merge branch 'ticket27547_035_01_squashed'
2018-09-13 11:48:13 -04:00
e7ab20710c
hs-v3: Add changes file and man page for client authorization
...
Closes #27547
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-09-13 11:47:58 -04:00
3ddfd5ff25
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-13 11:46:04 -04:00
8253428253
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-13 11:46:04 -04:00
d44eb16b23
Merge branch 'maint-0.3.4'
2018-09-13 11:46:04 -04:00
9697c2da46
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-13 11:46:04 -04:00
f308e81fa7
Merge branch 'maint-0.3.4'
2018-09-12 17:25:40 -04:00
f8d5fb42a3
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-12 17:24:41 -04:00
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
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
Nick Mathewson
cypherpunks
rl1987
Mike Perry
David Goulet
Karsten Loesing
Taylor Yu