Nick Mathewson
f04d7e6009
Merge remote branch 'sjmurdoch/cloexec' into cloexec
2010-11-21 17:01:30 -05:00
Steven Murdoch
38da44cbf4
Fix compile error on MacOS X (and other platforms without O_CLOEXEC)
2010-11-21 15:27:50 -05:00
Steven Murdoch
15f2b7859b
Don't both open the socket with SOCK_CLOEXEC and set FD_CLOEXEC
2010-11-21 15:40:17 +00:00
Steven Murdoch
9d63dfcf49
Fix compile error on MacOS X (and other platforms without O_CLOEXEC)
2010-11-20 13:50:55 +00:00
Nick Mathewson
b4f56dd4c6
Obviate need for doing a CLOEXEC on pipes: just close them before exec
2010-11-20 01:24:30 -05:00
Nick Mathewson
e669d25e43
Do cloexec on socketpairs and stdio files
2010-11-20 01:16:29 -05:00
Nick Mathewson
5a66de7015
Initial work to set CLOEXEC on all possible fds
...
Still to go: some pipes, all stdio files.
2010-11-20 00:58:40 -05:00
Nick Mathewson
e361de80bb
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/router.c
2010-11-19 16:58:22 -05:00
Nick Mathewson
21be4b5b4c
Merge commit 'c643e0527c186b8ef2d259b2ef11a10c1d4ee3e5'
...
Conflicts:
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
2010-11-19 16:55:07 -05:00
Nick Mathewson
a33b338c5b
Fix a unit test broken by fix for 2195
2010-11-19 16:50:14 -05:00
Nick Mathewson
54551f3148
Merge branch 'fix2183', remote branch 'rransom/fix2195-v2' into maint-0.2.2
2010-11-19 16:48:13 -05:00
Robert Ransom
b3470ce957
Add changes file for bug2195.
2010-11-19 13:46:09 -08:00
Robert Ransom
69472ca421
Fix logic error in router_dump_router_to_string.
...
Spotted by Nick Mathewson.
2010-11-19 13:23:45 -08:00
Nick Mathewson
e88486bc9d
Add comments to some of the bug2183 fix code
2010-11-19 16:13:11 -05:00
Nick Mathewson
c77a32932d
Fix wide lines in SIGNAL patch
2010-11-19 15:54:53 -05:00
Nick Mathewson
576b399b19
Add a changes file for SIGNAL events
2010-11-19 15:54:02 -05:00
Nick Mathewson
8f74e6ce26
Add some caveats to the signal event
2010-11-19 15:52:10 -05:00
John Brooks
7441999738
Add a SIGNAL event for control connections
...
Implements ticket #1955
2010-11-19 15:49:54 -05:00
Robert Ransom
780b8f4287
Generate a router descriptor even if generating an extra-info descriptor fails.
...
Fixes bug #2195 .
2010-11-17 08:33:48 -08:00
Robert Ransom
213bcb3c40
Do not emit an extra-info-digest descriptor line if the digest is zero.
2010-11-17 08:32:17 -08:00
Karsten Loesing
0f1afaf595
Tweak the bugfix for 2183 a bit more.
2010-11-17 10:43:14 +01:00
Roger Dingledine
c643e0527c
new development version
2010-11-16 14:45:40 -05:00
Roger Dingledine
910de7dfac
final touchups
2010-11-16 01:12:32 -05:00
Roger Dingledine
4f66bf4fe7
Merge branch 'maint-0.2.2'
...
Conflicts:
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
2010-11-16 00:21:41 -05:00
Roger Dingledine
e1e7988537
bump to 0.2.2.18-alpha
2010-11-16 00:20:49 -05:00
Roger Dingledine
6b82a6e88d
Merge branch 'maint-0.2.2'
2010-11-16 00:16:25 -05:00
Roger Dingledine
a08a7e0fc6
warn more about AllowSingleHopExits
2010-11-16 00:13:25 -05:00
Roger Dingledine
e0b922b7e6
merge in more changelog entries
2010-11-15 23:54:20 -05:00
Roger Dingledine
a641646a98
Merge commit 'nickm/1776_redux_v1' into maint-0.2.2
2010-11-15 23:29:09 -05:00
Nick Mathewson
45b500d5a6
Clean up my 1776 fix a bit
...
Sebastian notes (and I think correctly) that one of our ||s should
have been an &&, which simplifies a boolean expression to decide
whether to replace bridges. I'm also refactoring out the negation at
the start of the expression, to make it more readable.
2010-11-15 19:43:53 -05:00
Nick Mathewson
550be1df69
Merge remote branch 'origin/maint-0.2.2'
2010-11-15 15:41:37 -05:00
Nick Mathewson
cbad9f4520
Move controller event for socks warning into log_unsafe_socks_warning
2010-11-15 15:41:21 -05:00
Nick Mathewson
9399b885cd
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/buffers.c
2010-11-15 15:37:23 -05:00
Nick Mathewson
522c204ac9
Merge branch 'bug2000_nm_022' into maint-0.2.2
2010-11-15 15:31:40 -05:00
Nick Mathewson
ba1b7a1ce1
Merge remote branch 'origin/maint-0.2.2'
2010-11-15 14:30:12 -05:00
Nick Mathewson
29c468146d
changes entry for nopublish removal in 5040c855d
2010-11-15 14:29:53 -05:00
Nick Mathewson
8c2affe637
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/config.c
src/or/cpuworker.c
2010-11-15 14:14:13 -05:00
Nick Mathewson
ac2c0cb587
Make the coducmentation for SingleHop stuff slightly more dire
2010-11-15 14:09:32 -05:00
Nick Mathewson
433a98131a
Merge remote branch 'sebastian/manpagefixups' into maint-0.2.2
2010-11-15 14:07:00 -05:00
Sebastian Hahn
da3a6e724f
Rate-limit unsafe socks warning
...
Pick 5 seconds as the limit. 5 seconds is a compromise here between
making sure the user notices that the bad behaviour is (still) happening
and not spamming their log too much needlessly (the log message is
pretty long). We also keep warning every time if safesocks is
specified, because then the user presumably wants to hear about every
blocked instance.
(This is based on the original patch by Sebastian, then backported to
0.2.2 and with warnings split into their own function.)
2010-11-15 13:57:37 -05:00
Karsten Loesing
ff1cf35442
Don't use log_err for non-criticial warnings.
2010-11-15 13:39:53 +01:00
Karsten Loesing
cec21652a7
Try harder not to exceed the 50 KB extra-info descriptor limit.
...
Our checks that we don't exceed the 50 KB size limit of extra-info
descriptors apparently failed. This patch fixes these checks and reserves
another 250 bytes for appending the signature. Fixes bug 2183.
2010-11-15 12:51:51 +01:00
Nick Mathewson
3d7772ece3
Merge remote branch 'karsten/enhancement1883'
2010-11-12 14:13:17 -05:00
Nick Mathewson
d61736aa6a
Merge remote branch 'origin/maint-0.2.2'
2010-11-12 13:06:54 -05:00
Nick Mathewson
dbba84c917
Avoid perma-blocking the controller on bug in shrink_freelist
...
In all likelihood, this bug would make Tor assert, but if it doesn't,
let's not have two bugs.
2010-11-12 13:05:58 -05:00
Nick Mathewson
3a7614c670
Add changes file for bug1125
2010-11-12 13:03:18 -05:00
Nick Mathewson
22318e952e
Merge remote branch 'rransom/bug1125-022' into maint-0.2.2
2010-11-12 13:03:00 -05:00
Nick Mathewson
2f8114d0a7
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-11-12 13:01:41 -05:00
Nick Mathewson
566a115be1
Add changes file for bug1125
2010-11-12 12:59:42 -05:00
Robert Ransom
a421e284d0
Disable logging to control port connections in buf_shrink_freelists.
...
If buf_shrink_freelists calls log_warn for some reason, we don't want the log
call itself to throw buf_shrink_freelists further off the rails.
2010-11-12 03:07:09 -08:00
