Nick Mathewson
22e6880296
Merge branch 'ticket22377'
2017-09-08 08:06:44 -04:00
Nick Mathewson
e5e2df36f3
Merge remote-tracking branch 'dgoulet/ticket23427_032_01'
2017-09-07 15:20:01 -04:00
Nick Mathewson
36104e55e4
Merge branch 'maint-0.3.1'
2017-09-07 15:18:01 -04:00
Nick Mathewson
54fb1d0f7f
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-07 15:18:01 -04:00
Nick Mathewson
a9d4df9a08
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-07 15:18:01 -04:00
Nick Mathewson
08592c95fa
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-09-07 15:18:00 -04:00
Nick Mathewson
bcf2b413c3
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-09-07 15:18:00 -04:00
Karsten Loesing
09618ffe38
Update geoip and geoip6 to the September 6 2017 database.
2017-09-07 21:06:16 +02:00
David Goulet
2080a986ed
doc: Add our Ubuntu packager to ReleasingTor.md
...
His full name is: Simon Deziel.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-07 12:35:31 -04:00
Nick Mathewson
f117da3ea0
Whoops -- I messed a calltool target
2017-09-07 11:03:22 -04:00
Nick Mathewson
12df7a478c
Merge branch 'calltool'
2017-09-07 10:51:25 -04:00
Nick Mathewson
283be00b0b
Add support for running "calltool" on Tor via "make callgraph".
...
Closes #19307 .
2017-09-07 10:51:02 -04:00
Nick Mathewson
8421756da3
Talk about assertions in CodingStandards.md
2017-09-07 09:37:39 -04:00
Nick Mathewson
1502bf03fd
Add a module comment to util_bug.h
...
Closes ticket 22824.
2017-09-07 09:31:30 -04:00
Nick Mathewson
1e079ec30d
Merge branch 'maint-0.3.1'
2017-09-07 08:51:16 -04:00
Nick Mathewson
9c404602a0
Add a stack trace to the warning at issue with 23105.
...
With luck, this will help us diagnose 23105 and fix it.
I also added a stack trace to the warning right before it, since why
not.
2017-09-07 08:49:11 -04:00
Nick Mathewson
ae7cb3349e
Merge branch 'bug23361_032_01_squashed2'
2017-09-07 08:35:35 -04:00
David Goulet
c527cde82f
prop224: Pick rendezvous point of protover HSRend=2
...
Version 3 hidden service needs rendezvous point that have the protocol version
HSRend >= 2 else the rendezvous cells are rejected.
Fixes #23361
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-07 08:35:28 -04:00
Nick Mathewson
ab18e5e5fc
Better error on failure to load seccomp2 sandbox
...
There are two reasons this is likeliest to happen -- no kernel
support, and some bug in Tor. We'll ask people to check the former
before they report. Closes 23090.
2017-09-06 14:23:47 -04:00
Nick Mathewson
9261f612ad
Merge remote-tracking branch 'dgoulet/bug23123_032_01'
2017-09-06 14:17:43 -04:00
Nick Mathewson
b268dca411
Correctly describe which inputs would confuse the old BSD strtol
...
This fixes our changelog's description of 22789.
2017-09-06 13:24:04 -04:00
Nick Mathewson
342712b9ef
Make url-canonicalizer canonicalize correctly.
2017-09-05 15:02:16 -04:00
Nick Mathewson
4e02d02076
Fix an erroneous !
2017-09-05 14:55:13 -04:00
Nick Mathewson
4ce60dab00
Resolve inconsistencies between buf refactor and HTTP connect
2017-09-05 14:41:35 -04:00
Nick Mathewson
73b0e2e6fd
Merge branch 'http_tunnel_squashed'
2017-09-05 14:34:29 -04:00
Nick Mathewson
ad9190404b
Add a fuzzer for HTTP CONNECT
2017-09-05 14:34:09 -04:00
Nick Mathewson
fead644956
Add a manpage entry and changes file for for HTTPTunnelPort
2017-09-05 14:34:09 -04:00
Nick Mathewson
53e4272b65
Add stream isolation support for HTTP CONNECT tunnels
...
I'm doing this using the Proxy-Authorization: header to support
clients that understand it, and with a new tor-specific header that
makes more sense for our use.
2017-09-05 14:34:09 -04:00
Nick Mathewson
4b30ae1581
Add support for HTTP Connect tunnels
2017-09-05 14:34:09 -04:00
Nick Mathewson
eda79c2f78
Export http-command parsing functions.
2017-09-05 14:34:09 -04:00
Nick Mathewson
c0b9f594b6
Make preferred_chunk_size nonstatic, and add a prefix to it
2017-09-05 14:17:18 -04:00
Nick Mathewson
4bac93ba5d
Merge branch 'refactor_buffers_api_3'
2017-09-05 14:04:03 -04:00
Nick Mathewson
6ec5059723
Refactor buffer APIs to put a buf_t first.
...
By convention, a function that frobs a foo_t should be called
foo_frob, and it should have a foo_t * as its first argument. But
for many of the buf_t functions, the buf_t was the final argument,
which is silly.
2017-09-05 13:57:51 -04:00
Nick Mathewson
d61da9e61f
Repair wide lines from previous commit.
2017-09-05 13:57:51 -04:00
Nick Mathewson
4a7e90adc5
Repair buffer API so everything starts with buf_.
...
Our convention is that functions which manipulate a type T should be
named T_foo. But the buffer functions were super old, and followed
all kinds of conventions. Now they're uniform.
Here's the perl I used to do this:
\#!/usr/bin/perl -w -i -p
s/read_to_buf\(/buf_read_from_socket\(/;
s/flush_buf\(/buf_flush_to_socket\(/;
s/read_to_buf_tls\(/buf_read_from_tls\(/;
s/flush_buf_tls\(/buf_flush_to_tls\(/;
s/write_to_buf\(/buf_add\(/;
s/write_to_buf_compress\(/buf_add_compress\(/;
s/move_buf_to_buf\(/buf_move_to_buf\(/;
s/peek_from_buf\(/buf_peek\(/;
s/fetch_from_buf\(/buf_get_bytes\(/;
s/fetch_from_buf_line\(/buf_get_line\(/;
s/fetch_from_buf_line\(/buf_get_line\(/;
s/buf_remove_from_front\(/buf_drain\(/;
s/peek_buf_startswith\(/buf_peek_startswith\(/;
s/assert_buf_ok\(/buf_assert_ok\(/;
2017-09-05 13:57:51 -04:00
Nick Mathewson
336aa21e37
Move buffers.c and buffers_tls.c into src/common
...
These are no longer tor-specific, so they can be part of the
infrastructure.
2017-09-05 13:57:51 -04:00
Nick Mathewson
150089cbd7
Move the tls parts of buffers.c into buffers_tls.c
2017-09-05 13:57:51 -04:00
Nick Mathewson
5921b465e7
Make buffers.c independent of or.h
...
Also, put ext_or function in new module; it had accidentally gotten
into proto_socks.c
2017-09-05 13:57:51 -04:00
Nick Mathewson
f28e314b0d
Make buf_pullup() expose the pulled-up data.
...
This lets us drop the testing-only function buf_get_first_chunk_data(),
and lets us implement proto_http and proto_socks without looking at
buf_t internals.
2017-09-05 13:57:51 -04:00
Nick Mathewson
cddac959e7
Replace buf->datalen usage in proto_*.c with buf_datalen() call.
...
This lets us remove BUFFERS_PRIVATE from two of the modules.
2017-09-05 13:57:51 -04:00
Nick Mathewson
234c5015f1
Move protocol-specific functions out of buffers.c
...
This commit does not change the implementation of any function: it
only moves code and adds new includes as necessary. Part of #23149 .
2017-09-05 13:57:51 -04:00
Nick Mathewson
babe31fc7c
Not all invizbox people have the same TLD... :/
2017-09-05 10:43:31 -04:00
Nick Mathewson
e2969759a7
Remove changes files that are already merged in 0.3.1.6-rc
2017-09-05 10:43:17 -04:00
Nick Mathewson
ccb671dc1c
Merge branch 'maint-0.3.1'
...
"ours" merge to avoid version bump.
2017-09-05 10:21:05 -04:00
Nick Mathewson
fd0a894d28
Bump to 0.3.1.6-rc-dev
2017-09-05 10:20:34 -04:00
Nick Mathewson
841f48ac44
forward-port the 0.3.1.6-rc changelog
2017-09-05 10:19:49 -04:00
Nick Mathewson
73d7526fb4
Merge branch 'maint-0.3.1'
2017-09-05 09:26:39 -04:00
David Goulet
7eaf055b28
test: Fix memory leak in hs_descriptor/decode_bad_signature
...
Fixes #23319
Cherry-picked from master; bug not in any released Tor.
2017-09-05 09:26:21 -04:00
Nick Mathewson
e58f11077e
Merge branch 'maint-0.3.1'
...
"ours" merge to avoid version bump
2017-09-05 08:31:20 -04:00
Nick Mathewson
2d55620a9e
Bump version to 0.3.1.6-rc
2017-09-05 08:30:52 -04:00