Nick Mathewson
b6164e1604
Merge remote-tracking branch 'public/feature20552'
2016-11-10 09:25:11 -05:00
Nick Mathewson
f82f0c3eb1
Merge remote-tracking branch 'dgoulet/bug20574_030_01'
2016-11-10 09:22:34 -05:00
Nick Mathewson
217b895831
Merge remote-tracking branch 'dgoulet/ticket19642_030_01'
2016-11-10 09:16:00 -05:00
Matt Nordhoff
7dee70c3e1
Add "TByte" and "TBytes" units; also add "TBits" to man page
2016-11-10 09:13:27 -05:00
Nick Mathewson
0f4f63b7b8
Merge branch 'maint-0.2.9'
2016-11-10 09:11:35 -05:00
Nick Mathewson
e8e7a8f3db
Merge remote-tracking branch 'teor/bug20613' into maint-0.2.9
2016-11-10 09:10:55 -05:00
Nick Mathewson
d564187dee
Merge branch 'maint-0.2.9'
2016-11-08 19:25:44 -05:00
teor
0ec94588ab
Stop logging single onion and Tor2web long-term one-hop circuits
...
Single onion services and Tor2web deliberately create long-term one-hop
circuits to their intro and rend points, respectively.
These log messages are intended to diagnose issue 8387, which relates to
circuits hanging around forever for no reason.
Fixes bug 20613; bugfix on 0.2.9.1-alpha. Reported by "pastly".
2016-11-09 11:23:51 +11:00
Nick Mathewson
e4ef9f7491
In torrc.sample.in, note that bandwidth must be >=75 KB.
...
Queue a corresponding change for torrc.minimal.in.
Closes ticket 20085.
2016-11-08 19:23:49 -05:00
teor
5dca9487c4
Call get_options() once at the top of circuit_log_ancient_one_hop_circuits()
...
Refactoring, no behaviour change.
2016-11-09 11:15:48 +11:00
Nick Mathewson
c58592e658
Merge branch 'maint-0.2.9'
2016-11-08 18:51:19 -05:00
Nick Mathewson
89ec191b68
Merge remote-tracking branch 'public/bug20306_029' into maint-0.2.9
2016-11-08 18:51:07 -05:00
Nick Mathewson
31f41fe096
Merge branch 'maint-0.2.9'
2016-11-08 18:45:10 -05:00
Nick Mathewson
286fa94064
Use va_copy() in pure-windows version of tor_asprintf().
...
It's not okay to use the same varargs list twice, and apparently
some windows build environments produce code here that would leave
tor_asprintf() broken. Fix for bug 20560; bugfix on 0.2.2.11-alpha
when tor_asprintf() was introduced.
2016-11-08 18:44:06 -05:00
David Goulet
34f14a35b6
hs: Add single-onion-service line to v3 descriptor
...
This field indicates if the service is a Single Onion Service if present in
the descriptor.
Closes #19642
Signed-off-by: David Goulet <dgoulet@torproject.org>
2016-11-08 13:22:42 -05:00
Nick Mathewson
053cf55cab
forwardport changelog
2016-11-08 07:57:04 -05:00
Nick Mathewson
93c430cab3
Merge branch 'maint-0.2.9'
...
This is an "ours" merge to avoid bumping the version.
2016-11-08 07:55:53 -05:00
Nick Mathewson
74e84b7eb7
Bump version to 0.2.9.5-alpha-dev
2016-11-08 07:55:15 -05:00
Nick Mathewson
d1a0f2e7e4
Merge branch 'maint-0.2.9'
2016-11-08 07:12:16 -05:00
teor
38e3f91c63
When using exponential backoff in test networks, use a lower exponent
...
Lower exponents mean that delays do not vary as much. This helps test
networks bootstrap consistently.
Bugfix on 20499.
2016-11-08 16:42:26 +11:00
Nick Mathewson
a9fb2b4047
typo fix in doc/HACKING/ReleasingTor.md
2016-11-07 18:54:51 -05:00
Nick Mathewson
0d6ee26af9
Merge branch 'maint-0.2.9'
...
This is an "ours" merge to avoid taking the version bump.
2016-11-07 16:39:15 -05:00
Nick Mathewson
3dfecffa7d
bump version to 0.2.9.5-alpha
2016-11-07 16:38:53 -05:00
Nick Mathewson
e0311f6a36
Remove from master more changes files already merged in release-0.2.9
2016-11-07 16:32:30 -05:00
Nick Mathewson
3e3040a5d9
Merge branch 'maint-0.2.9'
...
Conflicts:
src/or/rendservice.c
2016-11-07 16:31:40 -05:00
Nick Mathewson
9994404238
Make new changes files pass lintchanges
2016-11-07 16:19:05 -05:00
Nick Mathewson
c2fc0941a5
Merge remote-tracking branch 'teor/bug20484_029_v2' into maint-0.2.9
2016-11-07 16:12:13 -05:00
Nick Mathewson
7236e42684
Merge branch 'maint-0.2.9'
2016-11-07 16:10:55 -05:00
Nick Mathewson
e482541cfb
Fix another 20499-broken test
2016-11-07 16:10:42 -05:00
Nick Mathewson
d2071c36f6
Fix a unit test (broken by recent 20499 hacking)
2016-11-07 16:02:55 -05:00
teor
a77187a52c
Add onion_service_non_anonymous file to man page
2016-11-08 07:45:02 +11:00
David Goulet
4ff534495f
hs: Document arguments of rend_data_*_create()
...
Fixes #20567
Signed-off-by: David Goulet <dgoulet@torproject.org>
2016-11-07 14:03:32 -05:00
David Goulet
b0ea8b535f
hs: Add changes file for HSDir v3 protocol feature
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2016-11-07 13:49:27 -05:00
Nick Mathewson
89edef6afb
Treat bacoff/schedule mismatch as a bug.
2016-11-07 11:05:57 -05:00
Nick Mathewson
1934bf75ef
Merge branch 'maint-0.2.9'
2016-11-07 11:02:15 -05:00
Nick Mathewson
293aca9929
Merge branch 'bug20534_029_squashed' into maint-0.2.9
2016-11-07 11:01:31 -05:00
Nick Mathewson
e51f105c41
Reduce multiplier to 3, per teor's recommendation on #20534
...
(Three _is_ a good number for anonymity!)
2016-11-07 11:01:21 -05:00
Nick Mathewson
85970f7047
Always increment delays by at least 1.
2016-11-07 11:01:21 -05:00
Nick Mathewson
1fdf6e5814
Avoid integer overflow in delay calculation.
2016-11-07 11:01:21 -05:00
Nick Mathewson
864c42f4d6
Count HTTP 503 as a download failure.
...
Because as Teor puts it: "[Resetting on 503] is exactly what we
don't want when relays are busy - imagine clients doing an automatic
reset every time they DoS a relay..."
Fixes bug 20593.
2016-11-07 11:01:21 -05:00
Nick Mathewson
667ba776b1
Adjust download schedules per teor's #20534 recommendataions
2016-11-07 11:01:20 -05:00
David Goulet
18e0a0b70d
test: Remove useless HS decode multiple intro points
...
The test was broken and skipped because the hardcoded cross certificate didn't
include the dynamically generated signing key generated by the test. The only
way we could have fixed that is extracting the signing key from the hardcoded
string and put it in the descriptor object or dynamically generate the cross
certificate.
In the end, all this was kind of pointless as we already test the decoding of
multiple introduction points elsewhere and we don't gain anything with that
specific test thus the removal.
Fixes #20570
Signed-off-by: David Goulet <dgoulet@torproject.org>
2016-11-07 10:59:30 -05:00
Nick Mathewson
800dff1308
Merge branch 'maint-0.2.9'
2016-11-07 09:32:21 -05:00
Nick Mathewson
e4b793fe41
Merge branch 'maint-0.2.8' into maint-0.2.9
2016-11-07 09:32:00 -05:00
Nick Mathewson
2639fd08e7
Merge branch 'maint-0.2.7' into maint-0.2.8
2016-11-07 09:31:36 -05:00
Nick Mathewson
f5fdf188b9
Merge branch 'maint-0.2.6' into maint-0.2.7
2016-11-07 09:30:42 -05:00
Nick Mathewson
6c2174d44d
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-11-07 09:30:16 -05:00
Nick Mathewson
db2571be61
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-11-07 09:29:54 -05:00
Nick Mathewson
d82ffb77f3
Merge branch '20499_part1_029_squashed', remote-tracking branches 'teor/bug20591_029' and 'teor/bug20533_029' into maint-0.2.9
2016-11-07 09:20:13 -05:00
Nick Mathewson
858867a31a
Allow infinitely long delays in exponential-backoff downloads
...
It's only safe to remove the failure limit (per 20536) if we are in
fact waiting a bit longer each time we try to download.
Fixes bug 20534; bugfix on 0.2.9.1-alpha.
2016-11-07 09:19:35 -05:00
