702c0502cf
Merge remote-tracking branch 'public/bug9731'
2013-10-31 14:09:18 -04:00
61029d6926
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-31 14:03:01 -04:00
1b312f7b55
Merge remote-tracking branch 'public/bug9780_024_v2' into maint-0.2.4
2013-10-31 14:02:28 -04:00
0e8ee795d9
Merge remote-tracking branch 'public/bug6055_v2_024' into maint-0.2.4
2013-10-31 13:14:39 -04:00
d4af57a2c6
Add changelog entry for merged #7359 .
2013-10-31 09:21:13 +01:00
9e0ed8136a
Fix an always-true assert in PT code.
2013-10-29 22:49:37 +00:00
4b6f074df9
Merge remote-tracking branch 'public/bug5018'
...
Conflicts:
src/or/entrynodes.c
2013-10-29 01:29:59 -04:00
6f33dffec1
Only launch transport proxies that provide useful transports.
2013-10-29 01:05:56 -04:00
7578606a22
Merge remote-tracking branch 'public/bug9934_nm'
2013-10-25 12:15:31 -04:00
c95cc088c1
Tweak 5605 changes file
2013-10-25 12:07:15 -04:00
f249074e41
Merge remote-tracking branch 'Ryman/bug5605'
2013-10-25 12:03:42 -04:00
4b8282e50c
Log the origin address of controller connections
...
Resolves 9698; patch from "sigpipe".
2013-10-25 11:52:45 -04:00
b7a17de454
Better detection for certain broken cross-compiling situations.
...
Fixes bug 9869; patch from Benedikt Gollatz.
2013-10-21 13:30:38 -04:00
21ac292820
Give a better warning when stack protection breaks linking.
...
Fix for 9948; patch from Benedikt Gollatz.
2013-10-21 13:07:47 -04:00
71bd100976
DROPGUARDS controller command
...
Implements ticket 9934; patch from "ra"
2013-10-21 13:02:25 -04:00
17d368281a
Merge remote-tracking branch 'linus/bug9206_option'
2013-10-16 11:20:43 -04:00
1129362bd7
changes file for bug9651
2013-10-14 11:44:20 -04:00
a26a5794a3
Merge branch 'maint-0.2.4'
2013-10-12 10:48:30 -04:00
8f9fb63cdb
be willing to bootstrap from all three of our directory guards
...
Also fix a bug where if the guard we choose first doesn't answer, we
would try the second guard, but once we connected to the second guard
we would abandon it and retry the first one, slowing down bootstrapping.
The fix in both cases is to treat all our initially chosen guards as
acceptable to use.
Fixes bug 9946.
2013-10-12 10:42:27 -04:00
187398318e
When python is available, run the commandline unit tests from "make check"
2013-10-11 13:07:14 -04:00
0546edde66
Merge branch 'bug1376'
2013-10-11 12:51:15 -04:00
7ef9ecf6b3
Fix some whitespace; tighten the tests.
2013-10-11 12:51:07 -04:00
6f9584b3fd
Make --version, --help, etc incremement quiet level, never decrease it
...
Fixes other case of #9578
2013-10-11 12:32:59 -04:00
64293135df
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-11 11:17:18 -04:00
7ef2939e5a
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-10-11 11:16:59 -04:00
82d8944928
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-10-11 11:16:45 -04:00
3b0265198f
Update to the October 2013 GeoIP database.
2013-10-11 13:36:30 +02:00
f96a8d5fa3
Report bootstrapping progress correctly when downloading microdescs
...
We had updated our "do we have enough microdescs to begin building
circuits?" logic most recently in 0.2.4.10-alpha (see bug 5956), but we
left the bootstrap status event logic at "how far through getting 1/4
of them are we?"
Fixes bug 9958; bugfix on 0.2.2.36, which is where they diverged (see
bug 5343).
2013-10-10 21:39:21 -04:00
df4693fed5
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-10 11:24:16 -04:00
2c7ed0406f
Merge branch 'bug9644_024' into maint-0.2.4
2013-10-10 11:23:46 -04:00
97285bc465
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-10 10:55:58 -04:00
1137817319
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-10-10 10:55:24 -04:00
6eb7f2f889
Merge remote-tracking branch 'public/bug9928' into maint-0.2.3
2013-10-10 10:53:27 -04:00
882fb8383d
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-09 09:45:21 -04:00
270dcc9131
Changes file for 9854
2013-10-09 09:43:54 -04:00
9de456a303
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-08 16:47:49 -04:00
b8abadedd3
When examining interfaces to find an address, discard non-up ones.
...
Patch from "hantwister" on trac. Fixes bug #9904 ; bugfix on
0.2.3.11-alpha.
2013-10-08 16:46:29 -04:00
72c1e5acfe
Switch ECDHE group default logic for bridge/relay TLS
...
According to the manpage, bridges use P256 for conformity and relays
use P224 for speed. But skruffy points out that we've gotten it
backwards in the code.
In this patch, we make the default P256 for everybody.
Fixes bug 9780; bugfix on 0.2.4.8-alpha.
2013-10-08 16:32:07 -04:00
fa1034cd99
Changes file for 9866
2013-10-08 16:06:36 -04:00
66624ded39
Merge remote-tracking branch 'origin/maint-0.2.4'
...
Conflicts:
src/or/relay.c
2013-10-08 13:38:47 -04:00
50fc8fb5c5
Merge remote-tracking branch 'public/bug9927' into maint-0.2.4
2013-10-08 13:37:13 -04:00
1060688d2a
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-08 12:17:14 -04:00
7e0f1fa52a
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-10-08 12:16:42 -04:00
5e0404265f
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-08 12:11:37 -04:00
0c3c47565d
Merge remote-tracking branch 'public/bug9596' into maint-0.2.4
2013-10-08 12:10:47 -04:00
bfe56e05b0
Give credit to bug reporter for 9928
2013-10-08 12:06:06 -04:00
63234b1839
Merge branch 'bug9922'
2013-10-08 12:03:09 -04:00
b2a050cb2a
Finish changelog message for 9922.
2013-10-08 12:02:34 -04:00
5f13ae4b03
don't lie about bootstrap progress when clients use bridges
...
we were listing 50% as soon as we got a bridge's relay descriptor,
even if we didn't have any consensus, certificates, etc yet.
2013-10-08 11:50:53 -04:00
c8c2298015
Simply route length generation code.
...
The old code had logic to use a shorter path length if we didn't
have enough nodes. But we don't support 2-node networks anwyay.
Fix for #9926 . I'm not calling this a bugfix on any particular
version, since a 2-node network would fail to work for you for a lot
of other reasons too, and it's not clear to me when that began, or if
2-node networks would ever have worked.
2013-10-08 11:48:33 -04:00
Nick Mathewson
Karsten Loesing
George Kadianakis
Roger Dingledine