Nick Mathewson
a5174b092e
Merge branch 'exitstats' into maint-0.2.2
2010-11-29 15:28:22 -05:00
Nick Mathewson
a8a8e08220
comment karsten's bug2196 patch a little
2010-11-29 15:27:54 -05:00
Nick Mathewson
c4d2a55a88
Rename proposal 171 file
2010-11-27 15:59:08 -05:00
Nick Mathewson
ae6b31aba9
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
2010-11-24 17:06:26 -05:00
Nick Mathewson
251b40f720
Merge remote branch 'rransom/fix2195-fix' into maint-0.2.2
2010-11-24 17:02:22 -05:00
Robert Ransom
de75afc556
Avoid dereferencing NULL if a bridge fails to build an ei descriptor.
...
Reported by an anonymous commenter on Trac.
2010-11-24 13:18:11 -08:00
Karsten Loesing
4fed43ab2e
Report only the top 10 ports in exit-port stats.
2010-11-24 08:45:05 +01:00
mingw-san
78df6404eb
Fix compilation with mingw and OpenSSL 0.9.8m+
2010-11-23 12:47:38 -05:00
Nick Mathewson
ff014eb5ea
Use S_CASE for ehostunreach, not E_CASE. Partial backport of 69deb22f. Fixes 0.2.1 compilation on windows
2010-11-23 12:47:21 -05:00
Roger Dingledine
2d6ee53fb9
stop shipping doc/img and doc/website in the tarball
2010-11-23 00:03:50 -05:00
Roger Dingledine
e57cb6b976
pick a more accurate release date
2010-11-22 22:44:20 -05:00
Nick Mathewson
2af14b671d
Have authorities reject routers running verions susceptible to bug 1038.
2010-11-22 11:16:36 -05:00
Roger Dingledine
713db8dbfa
bump to 0.2.2.19-alpha
2010-11-21 18:00:12 -05:00
Nick Mathewson
f04d7e6009
Merge remote branch 'sjmurdoch/cloexec' into cloexec
2010-11-21 17:01:30 -05:00
Roger Dingledine
f54e75a2c6
prepare for our emergency openssl fix release
2010-11-21 16:59:42 -05:00
Roger Dingledine
d77bc69b0c
found this whitespace fix in a sandbox
2010-11-21 15:57:22 -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
Nick Mathewson
cbd3745924
Merge remote branch 'origin/maint-0.2.2'
2010-11-21 14:34:22 -05:00
Nick Mathewson
2bd64f9e8f
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-11-21 14:33:11 -05:00
Nick Mathewson
a9d2148f53
Merge branch 'fix2204' into maint-0.2.1
2010-11-21 14:28:38 -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
Nick Mathewson
92a99736fd
Do not set the hostname TLS extension server-side; only client-side
...
This may fix bug 2204, and resolve the incompatibility with openssl
0.9.8p/1.0.0b.
2010-11-20 22:21:50 -05: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
9cbe64db45
Add missing cast when formatting uintptr_t
...
Found by Christian Kujau
2010-11-20 05:18:34 -05: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
