Nick Mathewson
79c7625e38
Merge branch 'feature13864_squashed'
2015-02-02 13:32:53 -05:00
rl1987
313e2a7dab
Changes file for 13865.
2015-02-02 13:31:56 -05:00
Nick Mathewson
69deab8b2a
Merge remote-tracking branch 'public/bug13319'
2015-02-02 10:25:25 -05:00
Nick Mathewson
f4b79bc420
Merge remote-tracking branch 'sysrqb/bug14216_bad_since'
2015-02-02 10:23:52 -05:00
Nick Mathewson
55639bc67f
Merge remote-tracking branch 'dgoulet/bug14202_026_v1'
2015-02-02 10:16:48 -05:00
Nick Mathewson
e78b7e2776
Merge remote-tracking branch 'public/14188_part1'
2015-02-02 10:15:26 -05:00
Matthew Finkel
4cb59ceb8e
Only retry connecting to configured bridges
...
After connectivity problems, only try connecting to bridges which
are currently configured; don't mark bridges which we previously
used but are no longer configured. Fixes 14216. Reported by
and fix provided by arma.
2015-01-31 09:46:18 +00:00
David Goulet
51f793e37e
Fix possible infinite loop on pipe/sock_drain()
...
If the returned value of read/recv is 0 (meaning EOF), we'll end up in an
infinite loop (active wait) until something is written on the pipe which is
not really what we want here especially because those functions are called
from the main thread.
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-01-30 15:05:18 -05:00
Nick Mathewson
fac8d40886
Merge remote-tracking branch 'public/prop227_v2'
...
Conflicts:
src/test/test_dir.c
2015-01-30 07:36:55 -05:00
Nick Mathewson
a87ea9b1c6
Merge branch 'bug14451_026_v1'
2015-01-29 15:16:15 -05:00
Nick Mathewson
4c5133e42d
changes file for 14451
2015-01-29 15:12:14 -05:00
Nick Mathewson
5faa017b86
Merge remote-tracking branch 'public/ticket11737'
2015-01-29 15:09:55 -05:00
Nick Mathewson
204374f7d9
Remove SocksSocket; it's now spelled differently thanks to 14451
...
Also, revise bug12585 changes file to mention new syntax
2015-01-29 14:46:20 -05:00
David Goulet
80bed1ac96
Remove obsolete workaround in dirserv_thinks_router_is_hs_dir()
...
Fixes #14202
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-01-29 12:55:19 -05:00
Nick Mathewson
a3de2dfde6
Merge branch 'bug11485_026_v2_squashed'
2015-01-28 14:32:19 -05:00
Andrea Shepard
603708d747
Changes file for ticket #11485
2015-01-28 14:30:23 -05:00
Nick Mathewson
b63bf09255
changes file for 8405
2015-01-28 12:06:28 -05:00
Nick Mathewson
f75ca04520
Tweak tor-resolve docs and logs
...
Resolves 14325
2015-01-28 10:11:08 -05:00
Nick Mathewson
e9caa8645e
Try to work around changes in openssl 1.1.0
...
Prefer not to use a couple of deprecated functions; include more
headers in tortls.c
This is part of ticket 14188.
2015-01-28 10:00:58 -05:00
Nick Mathewson
20d0b1a04e
Bump a client authorization message from debug to info.
...
A user wants this for 14015, and it seems fairly reasonable.
2015-01-28 09:42:28 -05:00
Nick Mathewson
e00503fe57
Merge branch 'doc13702_squashed'
2015-01-27 12:42:12 -05:00
rl1987
d7ac4d9130
Adding section on OpenBSD to doc/TUNING
2015-01-27 12:41:12 -05:00
Nick Mathewson
525a2ce6e3
changes file for bug14350
2015-01-26 10:06:36 -05:00
Nick Mathewson
7322de15dc
Split the slow unit tests into their own binary
...
This can run in parallel with the faster ones and the other tests.
2015-01-23 11:15:53 -05:00
Nick Mathewson
420037dcef
Merge branch 'if_addr_refactoring_squashed'
...
Conflicts:
src/test/include.am
src/test/test.c
2015-01-23 10:13:37 -05:00
rl1987
3966145dff
Refactor code that looks up addresses from interfaces
...
Now the code has separate implementation and examination functions,
uses smartlists sanely, and has relatively decent test coverage.
2015-01-23 10:07:17 -05:00
Nick Mathewson
0b12143346
changes file for 9969
2015-01-23 10:02:49 -05:00
Nick Mathewson
bd22ad12bd
fix warnings from lintChanges
2015-01-23 09:09:00 -05:00
Nick Mathewson
b677ccd3ab
Merge remote-tracking branch 'public/ticket13762'
2015-01-23 08:55:31 -05:00
Nick Mathewson
d8517fe843
Merge remote-tracking branch 'origin/maint-0.2.5'
2015-01-23 08:53:21 -05:00
Nick Mathewson
7cbdec578b
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-01-23 08:52:55 -05:00
Nick Mathewson
df4c484021
Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4
2015-01-23 08:52:35 -05:00
Nick Mathewson
dbd5a9a8f9
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2015-01-23 08:52:20 -05:00
Karsten Loesing
a9ce0cd659
Update geoip6 to the January 7 2015 database.
2015-01-22 09:58:29 +01:00
Karsten Loesing
c3f8f5ab0e
Update geoip to the January 7 2015 database.
2015-01-22 09:56:54 +01:00
Nick Mathewson
23fc1691b6
Merge branch 'better_workqueue_v3_squashed'
2015-01-21 14:47:16 -05:00
Nick Mathewson
f0415c1600
Merge branch 'bug9819'
2015-01-21 13:00:26 -05:00
Nick Mathewson
e7e33d4b04
Merge branch 'bug14084'
2015-01-20 14:07:37 -05:00
Nick Mathewson
9ddc1fb10c
Merge remote-tracking branch 'dgoulet/bug14224_025_v1'
2015-01-20 14:02:07 -05:00
Nick Mathewson
a8dd930274
Replace a 4 with a 6; fix a bug that nobody noticed :/
...
Fixes 14280 bugfix on 1053af0b9c
2015-01-19 11:51:08 -05:00
Nick Mathewson
1053af0b9c
Merge branch 'bug7555_v2_squashed'
...
Conflicts:
src/or/connection_edge.c
2015-01-19 11:43:41 -05:00
David Goulet
b5525476f5
Fix: close intro circuit if no more intro points are usable
...
Once a NACK is received on the intro circuit, tor tries an other usable one
by extending the current circuit to it. If no more intro points are usable,
now close the circuit. Also, it's reason is changed before closing it so we
don't report again an intro point failure and trigger an extra HS fetch.
Fixes #14224
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-01-19 10:23:58 -05:00
Nick Mathewson
63765399eb
Merge remote-tracking branch 'public/ticket13037'
...
Conflicts:
src/or/config.c
2015-01-18 16:07:08 -05:00
Nick Mathewson
fae72a8d0a
Merge remote-tracking branch 'public/bug14219_025'
2015-01-18 15:41:13 -05:00
Roger Dingledine
9407040c59
Do not replace a HS descriptor with a different replica of itself
...
This fixes a bug where we'd fetch different replicas of the same
descriptor for a down hidden service over and over, until we got lucky
and fetched the same replica twice in a row.
Fixes bug 14219; bugfix on 0.2.0.10-alpha.
(Patch from Roger; commit message and changes file by Nick.)
2015-01-18 15:39:12 -05:00
Nick Mathewson
efdac2a68c
Merge remote-tracking branch 'public/bug14261_025'
...
Conflicts:
src/or/directory.c
2015-01-18 15:28:35 -05:00
Nick Mathewson
ceb6dee465
Increase limit for status vote download size by a factor of 5.
...
We've started to hit the limit here. We introduced the limit in
0.1.2.5-alpha. This fixes bug 14261, but we should have a smarter way
to not actually do the behavior this permits. See #14267 for a ticket
about fixing that.
2015-01-18 15:25:29 -05:00
Nick Mathewson
54e4aaf52c
Fix memory leak in connection_ap_handshake_rewrite_and_attach()
...
Spotted by asn. #14259 . Bugfix on 368eb6a97
2015-01-18 14:19:26 -05:00
Nick Mathewson
79e12da861
Merge remote-tracking branch 'public/bug12485'
2015-01-18 13:49:30 -05:00
Nick Mathewson
ffa4ed8d3d
changes file for 9396005428
2015-01-16 11:47:49 -05:00
