4b6b398cff
Merge branch 'maint-0.2.2'
2011-02-07 22:21:01 -05:00
54ccc80a4a
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-02-07 22:20:35 -05:00
9c2cb6fc89
Update to the February 1 2011 Maxmind GeoLite Country database.
2011-02-07 22:19:37 -05:00
3bcba6d716
Merge remote branch 'origin/maint-0.2.2'
2011-02-07 12:51:34 -05:00
fcf3eb03bd
typo in manpage fix
2011-02-07 12:51:20 -05:00
ff5810aea9
Merge remote branch 'origin/maint-0.2.2'
2011-02-07 12:47:04 -05:00
98cef0ac1e
Merge branch 'bug2279' into maint-0.2.2
2011-02-07 12:43:54 -05:00
e854e01d57
Some cleanups to bug2279 messages/docs from rransom
2011-02-07 12:40:43 -05:00
c2c1f5b2a1
another api tweak to help task 1944
2011-02-07 10:43:41 -05:00
d3836b02cc
change APIs slightly to make #1944 easier
2011-02-07 06:39:21 -05:00
69f7c0385b
Merge remote branch 'origin/maint-0.2.2' for bug2203_rebased
...
There was a merge conflict in routerlist.c due to the new node_t logic.
Conflicts:
src/or/routerlist.c
2011-02-04 12:26:59 -05:00
e9803aa710
Merge branch 'bug2203_rebased' into maint-0.2.2
2011-02-04 12:22:18 -05:00
a6c811313a
Merge remote branch 'origin/maint-0.2.2'
2011-02-03 14:21:14 -05:00
f9e251ccf8
changes file for ASLR/DEP build on windows
2011-02-03 14:20:08 -05:00
895409011f
Enable ASLR and permanent DEP for Windows executables
...
Fix for #2358
2011-02-03 14:18:00 -05:00
cb9ac0336d
Merge maint-0.2.2: do not take manpage change from bug2450.
2011-02-03 14:00:59 -05:00
e94ee583d6
Merge remote branch 'sebastian/bug2450' into maint-0.2.2
2011-02-03 13:59:58 -05:00
912b76a1bf
Merge remote branch 'origin/maint-0.2.2'
2011-02-03 13:56:37 -05:00
2fa9ddb958
Merge remote branch 'public/bug2378' into maint-0.2.2
2011-02-03 13:54:28 -05:00
0fcb677e8a
tweak xxx-pluggable-transport based on comments from sjmurdoch
2011-02-02 15:34:59 -05:00
5815d73f92
Proposal 176: proposed v3 handshake
2011-01-31 21:49:21 -05:00
8d503d79c1
Add suggestion by Nikita to Proposal 171
2011-01-31 17:26:42 -05:00
f2bb7b17d7
Remove country codes from EntryNodes manpage entry
2011-01-28 14:19:28 +01:00
32dc51258b
Merge remote branch 'karsten/cbtdirspec'
2011-01-26 15:25:51 -05:00
30111a3a01
add documentation for ClientRejectInternalAddresses
2011-01-26 12:08:52 -05:00
0337fc7b06
Merge remote branch 'origin/maint-0.2.2'
2011-01-26 11:49:41 -05:00
e6da9a98e9
Merge branch 'bug2181' into maint-0.2.2
2011-01-26 11:46:13 -05:00
1dd98891d7
Explain soft shutdown mode a little better in the accountingmax documentation
2011-01-26 11:45:37 -05:00
5774ada5d2
Fix typo in dir-spec.txt [found by sebastian]
2011-01-26 11:41:33 -05:00
d92a415bed
Add an option to disable the block-private-addresses feature
...
Suggested by rransom. Probably necessary for testing network mode.
2011-01-26 11:35:24 -05:00
c417210ff3
Merge remote branch 'origin/maint-0.2.2'
2011-01-26 11:18:32 -05:00
58dfebbcb4
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-01-26 11:18:19 -05:00
46f36f3d62
Merge-forward our exit-notice backport (empty merge)
2011-01-26 11:18:13 -05:00
741ef2a8cd
fix the links in the exit-list notice we give out to users.
2011-01-26 11:15:09 -05:00
ebb287c75d
Backport current tor-exit-notice to 0.2.1
2011-01-26 11:15:09 -05:00
a880429a76
Merge remote branch 'origin/maint-0.2.2'
2011-01-26 11:08:02 -05:00
ba3b03def0
Merge branch 'bug2409' into maint-0.2.2
2011-01-26 11:06:59 -05:00
1478aa99b7
Merge branch 'bug2321' into maint-0.2.2
2011-01-26 11:06:55 -05:00
9a4b2ec764
Avoid sketchy integer cast in cbt code
...
When calling circuit_build_times_shuffle_and_store_array, we were
passing a uint32_t as an int. arma is pretty sure that this can't
actually cause a bug, because of checks elsewhere in the code, but
it's best not to pass a uint32_t as an int anyway.
Found by doorss; fix on 0.2.2.4-alpha.
2011-01-26 11:05:21 -05:00
411ec3c0f8
Add client code to detect attempts to connect to 127.0.0.1 etc
...
We detect and reject said attempts if there is no chosen exit node or
circuit: connecting to a private addr via a randomly chosen exit node
will usually fail (if all exits reject private addresses), is always
ill-defined (you're not asking for any particular host or service),
and usually an error (you've configured all requests to go over Tor
when you really wanted to configure all _remote_ requests to go over
Tor).
This can also help detect forwarding loop requests.
Found as part of bug2279.
2011-01-25 20:39:44 -05:00
85da676108
Fix double-mark bug when failing to init transparent connection
...
Fixes part of bug 2279. Bugfix on 0.1.2.1-alpha.
2011-01-25 19:07:03 -05:00
5ce8182bdb
Log more about soft-hibernation
2011-01-25 18:45:13 -05:00
e80bdfb4a0
Correctly detect BIO_new failures
...
This bug was noticed by cypherpunks; fixes bug 2378.
Bugfix on svn commit r110.
2011-01-25 18:26:49 -05:00
bfde636aad
Always treat failure to allocate an RSA key as an unrecoverable allocation error
2011-01-25 18:19:09 -05:00
76582442a8
Handle failing cases of DH allocation
2011-01-25 18:09:38 -05:00
c939c953ae
Remove an unused function in crypto.c
2011-01-25 18:07:02 -05:00
2dcc98e4f7
Merge remote branch 'origin/maint-0.2.2'
2011-01-25 17:53:20 -05:00
9e7691b05c
Comment remaining CBT functions.
...
Left circuit_build_times_get_bw_scale() uncommented because it is in the wrong
place due to an improper bug2317 fix. It needs to be moved and renamed, as it
is not a cbt parameter.
2011-01-25 17:52:01 -05:00
ffc3caf8d5
Describe consensus method 11 in dir-spec.txt
2011-01-25 17:49:50 -05:00
3ede94159e
Add changelog entry for bug2203.
2011-01-25 17:49:02 -05:00
Roger Dingledine
Karsten Loesing
Nick Mathewson
John Brooks
Sebastian Hahn
Andrew Lewman
Mike Perry