f1a004797e
Merge remote-tracking branch 'origin/maint-0.2.2'
...
Conflicts:
doc/tor.1.txt
2011-02-10 15:52:04 -05:00
20d493308a
Update documentation for PublishServerDescriptor (0.2.2.x)
2011-02-09 03:20:43 -08:00
043d8d34a6
Merge branch 'bug2408-v2-021' into bug2408-v2-022 (keep-ours)
2011-02-09 03:10:16 -08:00
449d895f06
Merge branch 'bug2408-v2-021-common' into bug2408-v2-022
2011-02-09 03:05:21 -08:00
5fc6967956
Update documentation for PublishServerDescriptor
2011-02-09 02:33:24 -08:00
7bf06d4a4f
Ignore and warn about "PublishServerDescriptor hidserv"
...
Fixes #2408 .
2011-02-09 02:33:24 -08:00
cc9809c1f7
Merge remote branch 'origin/maint-0.2.2'
2011-02-08 14:37:31 -05:00
d43470ad8a
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-02-08 14:37:02 -05:00
f25fc6e650
Merge remote branch 'origin/maint-0.2.2'
2011-02-08 14:02:43 -05:00
9c7e2cf010
Locking failures on windows are indicated by EACCES
...
Patch our implementation of tor_lockfile_lock() to handle this case
correctly. Also add a note that blocking behaviour differs from windows
to *nix. Fixes bug 2504, issue pointed out by mobmix.
2011-02-08 18:35:07 +01:00
bcbcda309a
move the clause above the "if bw is too low" check
2011-02-07 23:22:45 -05:00
20b75989ac
dtrt when only relaybandwidthburst is set
...
fixes bug 2470
2011-02-07 23:21:33 -05:00
32796bbe82
forward-port the 0.2.2.22-alpha changelog
2011-02-07 22:29:19 -05:00
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
Nick Mathewson
Robert Ransom
Sebastian Hahn
Roger Dingledine
Karsten Loesing
John Brooks
Andrew Lewman