Nick Mathewson
0f6bbbc74b
lintchanges fix
2017-09-21 10:42:40 -04:00
Nick Mathewson
c7b7cf8e18
Merge branch 'maint-0.3.1'
2017-09-21 10:39:10 -04:00
Mike Perry
d70a793cfc
Bug 23608: Mock time for all channelpadding tests.
2017-09-21 10:36:57 -04:00
Nick Mathewson
ac8e26a415
Use correct name for authtype 3 in a comment.
2017-09-20 15:46:21 -04:00
David Goulet
9b4513c5d1
hs: Log the intro point when we clean it up
...
When we remove an intro point from the service list, log info about it and
some useful data.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-20 13:08:16 -04:00
David Goulet
317dabc57f
circuit: Log n_circ_id and global identifier
...
When we can, log the n circuit id and global identifier for origin circuit.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-20 12:52:53 -04:00
Nick Mathewson
2998350122
Merge branch 'bug23080'
2017-09-20 12:12:02 -04:00
Nick Mathewson
ff0aabc35d
Merge branch 'maint-0.3.1'
2017-09-20 09:45:07 -04:00
Nick Mathewson
1a26c6be8b
changes file for bug23568
2017-09-20 09:45:03 -04:00
Andreas Stieger
427c2cc9e8
in zstd compression, fix 32 bit build
...
format '%lu' expects argument of type 'long unsigned int', but argument ... has type 'size_t'
Closes ticket 23568.
2017-09-20 09:43:08 -04:00
Nick Mathewson
427ae164f3
Fix a comment that misunderstood is_canonical
...
is_canonical doesn't mean "am I connected to the one true address of
this relay"; it means "does this relay tell me that the address I'm
connected to belong to it." The point is to prevent TCP-based MITM,
not to prevent the relay from multi-homing.
Related to 22890.
2017-09-20 09:41:01 -04:00
Nick Mathewson
c4e8548c59
Warn on ExtORPort USERADDR that is missing or 0.
...
Diagnoses violations on #23080 .
2017-09-20 08:50:49 -04:00
Nick Mathewson
9e0587f806
Merge remote-tracking branch 'dgoulet/ticket23305_032_01'
2017-09-20 08:36:11 -04:00
Nick Mathewson
654820ec1c
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-09-20 08:32:55 -04:00
Nick Mathewson
a8f4f5742e
Merge branch 'maint-0.3.1'
2017-09-20 08:32:55 -04:00
Nick Mathewson
746410fb24
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-09-20 08:32:55 -04:00
Nick Mathewson
2c93be80d9
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-09-20 08:32:55 -04:00
teor
8e52c46581
Remove longclaw's IPv6 address, as it will soon change
...
Authority IPv6 addresses were originally added in 0.2.8.1-alpha.
This leaves 3/8 directory authorities with IPv6 addresses, but there
are also 52 fallback directory mirrors with IPv6 addresses.
Resolves 19760.
2017-09-20 14:48:53 +10:00
Matt Traudt
4a3b61a5b3
sched: reorder code to fit comment bodies; comment typos
...
Closes 23560
2017-09-19 20:13:28 -04:00
Roger Dingledine
1c956ccd5f
fix typos/etc found while starting to look at scheduler
2017-09-19 19:55:57 -04:00
Nick Mathewson
6628c95e54
Merge remote-tracking branch 'pastly2/bug23566_032_01'
2017-09-19 19:35:46 -04:00
Matt Traudt
951b9f1fa5
tests: fix transproxy tests on BSD systems
2017-09-19 19:20:55 -04:00
Matt Traudt
a8c54ce581
sched: Allow the new sched to react to new cons
2017-09-19 19:07:48 -04:00
Nick Mathewson
ac73913d40
Merge branch 'bug23583_029'
2017-09-19 14:12:29 -04:00
Nick Mathewson
10ea3343b5
Avoid integer error in TEST_BITOPS tests
...
If "1" is not 64 bits wide already, then "1 << i" will not actually
work.
This bug only affects the TEST_BITOPS code, and shouldn't matter for
the actual use of the timeout code (except if/when it causes this
test to fail).
Reported by dcb314@hotmail.com . Fix for bug 23583. Not adding a
changes file, since this code is never compiled into Tor.
2017-09-19 13:58:35 -04:00
Nick Mathewson
7581ac7094
Merge remote-tracking branch 'hiro/gitlab-ci'
2017-09-19 13:43:53 -04:00
Nick Mathewson
a2caa466ee
Merge branch 'ticket21405'
2017-09-19 13:36:43 -04:00
Nick Mathewson
29e98d16d2
note the format we expect for IPv6
2017-09-19 13:19:45 -04:00
Nick Mathewson
7fcae5bffa
Merge branch 'maint-0.3.1'
2017-09-19 13:08:59 -04:00
Nick Mathewson
346066a42e
add rust registry to gitignore
2017-09-19 13:08:56 -04:00
Nick Mathewson
3bb6028a8e
Merge branch 'ticket18891'
2017-09-19 13:07:01 -04:00
Nick Mathewson
6d8f98646b
Clarify that Address is an IPv4 option only.
2017-09-19 13:06:54 -04:00
Nick Mathewson
5f08eb6e57
Merge branch 'ticket18736'
2017-09-19 13:03:20 -04:00
David Goulet
5dea4b565f
Add a BASE32_DIGEST_LEN define
...
Use this value instead of hardcoded values of 32 everywhere. This also
addresses the use of REND_DESC_ID_V2_LEN_BASE32 in
hs_lookup_last_hid_serv_request() for the HSDir encoded identity digest length
which is accurate but semantically wrong.
Fixes #23305 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-19 12:33:04 -04:00
Nick Mathewson
6010f9420a
Clarify the term "address" in the manpage
...
Closes 21405.
2017-09-19 10:22:35 -04:00
Nick Mathewson
f395f41868
fix a lintchanges problem
2017-09-19 10:03:32 -04:00
Nick Mathewson
b74a1c77a4
Document that .onion subdomains are ignored by clients
...
addr-spec.txt also explains this, but we should get it into the
manpage too.
Closes ticket #18736 .
2017-09-19 09:26:54 -04:00
Nick Mathewson
1f602e8643
plural in manpage
2017-09-19 08:48:39 -04:00
David Goulet
6f313edc8a
doc: Add version 3 to HiddenServiceVersion man page entry
...
Fixes #23580
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-09-19 08:39:43 -04:00
Nick Mathewson
84d587bed8
Merge remote-tracking branch 'teor/minor-comments'
2017-09-19 08:24:49 -04:00
teor
e77ece3b31
Avoid a compilation warning on macOS in scheduler_ev_add()
...
This warning is caused by a different tv_usec data type on macOS
compared to the system on which the patch was developed.
Fixes 23575 on 0.3.2.1-alpha.
2017-09-19 16:32:47 +10:00
teor
429d88ad6a
Improve comments around connection_or_client_used()
2017-09-19 14:30:27 +10:00
teor
228d782229
Improve comments formatting in connection.c
2017-09-19 14:30:09 +10:00
Nick Mathewson
6afc924d7e
Correct what-is-deprecated-when comments
2017-09-18 15:11:33 -04:00
Nick Mathewson
2b5bc5613c
Merge remote-tracking branch 'ewongbb/chkdblcolon'
2017-09-18 15:04:14 -04:00
Nick Mathewson
94a88eaa45
Merge remote-tracking branch 'public/ticket19704'
2017-09-18 15:02:16 -04:00
Nick Mathewson
3c9ff0af96
small tweaks to releasingtor.md
2017-09-18 14:49:06 -04:00
Nick Mathewson
8d300c48e7
Merge branch 'maint-0.3.1'
...
"ours" to avoid version bump.
2017-09-18 14:40:50 -04:00
Nick Mathewson
586c327e07
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" to avoid version bump.
2017-09-18 14:40:43 -04:00
Nick Mathewson
23c5259a38
Merge branch 'maint-0.2.9' into maint-0.3.0
...
"ours" to avoid version bump.
2017-09-18 14:40:36 -04:00