Nick Mathewson
ec18c8a06e
Merge branch 'haiku_port_rebase'
2011-12-19 11:29:29 -05:00
Nick Mathewson
9cabedd3eb
Explain why we are making gcc 3.3 work
2011-12-19 11:29:03 -05:00
Nick Mathewson
e535c8a460
Tweak the haiku-support patches
2011-12-19 11:27:08 -05:00
Martin Hebnes Pedersen
d5e964731c
Fixed build with GCC < 3.3
...
Preprocessor directives should not be put inside the arguments
of a macro. This is not supported on older GCC releases (< 3.3)
thus broke compilation on Haiku (running gcc2).
2011-12-19 11:27:08 -05:00
Martin Hebnes Pedersen
f783a326b8
-lm should not be hardcoded.
...
On some platforms (Haiku/BeOS) libm lives in libcore.
Also added 'network' to the list of libraries to search for connect().
2011-12-19 11:27:08 -05:00
George Kadianakis
d05bc02192
Add an informative header on the 'keys/dynamic_dh_params' file.
2011-12-19 16:06:22 +01:00
George Kadianakis
539cb627f7
Server transports should be instructed to bind on INADDR_ANY by default.
2011-12-18 13:21:58 +01:00
Nick Mathewson
e5e50d86ca
Ignore all bufferevent events on a marked connection
...
Bug 4697; fix on 0.2.3.1-alpha
2011-12-17 14:06:10 -05:00
Nick Mathewson
37504b5efa
Merge remote-tracking branch 'asn-mytor/bug4726'
2011-12-17 12:49:15 -05:00
Peter Palfrader
597e428df6
And a changes file for bug#4733
2011-12-17 12:21:56 -05:00
Peter Palfrader
f6b19ac79c
test_util_spawn_background_ok: fix expectation
...
test_util_spawn_background_ok() hardcoded the expected value
for ENOENT to 2. This isn't portable as error numbers are
platform specific, and particularly the hurd has ENOENT at
0x40000002.
Construct expected string at runtime, using the correct value
for ENOENT (closes : #4733 ).
2011-12-17 12:21:51 -05:00
Nick Mathewson
d37cb8f74a
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-12-16 17:50:54 -05:00
Nick Mathewson
cefff11950
Merge remote-tracking branch 'sebastian/clang-3.0-fixes_022' into maint-0.2.2
2011-12-16 17:49:41 -05:00
Nick Mathewson
9df0bf7a40
Merge remote-tracking branch 'sebastian/clang-3.0-fixes_master'
2011-12-16 17:48:25 -05:00
Roger Dingledine
3ee5924d18
put the stable changelogs into master too
2011-12-16 12:52:58 -05:00
Roger Dingledine
41cb249b7f
retroactively reformat a little bit
2011-12-16 12:27:38 -05:00
Nick Mathewson
663913e5ca
Increment version in master to 0.2.3.10-alpha-dev
2011-12-16 12:09:42 -05:00
George Kadianakis
6d35f08e01
Doxygenize the file-level documentation of transports.c.
2011-12-16 11:01:56 +01:00
Nick Mathewson
1fbce83f8c
Bump version to Tor 0.2.3.10-alpha
2011-12-15 12:04:52 -05:00
Nick Mathewson
a7b5e72463
Changelog and blurb for 0.2.3.10-alpha
2011-12-15 11:59:09 -05:00
Nick Mathewson
e402edd960
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-12-15 11:32:49 -05:00
Nick Mathewson
562c974ee7
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-12-15 11:28:44 -05:00
Nick Mathewson
9d0777839b
Add a fix for the buf_pullup bug that Vektor reported
2011-12-15 11:28:24 -05:00
Nick Mathewson
960f62bd82
Start a section for the 0.2.3.10-alpha changelog
2011-12-14 16:03:58 -05:00
Sebastian Hahn
bcca541da9
Build with warnings and clang 3.0
...
--enable-gcc-warnings enables two warnings that clang doesn't support,
so the build fails. We had hoped clang 3.0 would add those, but it
didn't, so let's just always disable those warnings when building with
clang. We can still fix it later once they add support
2011-12-13 07:43:53 +01:00
Robert Ransom
d688a40a0e
Don't crash on startup of a dormant relay
...
If a relay is dormant at startup, it will call init_keys before
crypto_set_tls_dh_prime. This is bad. Let's make it not so bad, because
someday it *will* happen again.
2011-12-12 11:25:55 -08:00
Sebastian Hahn
e4cebb76c5
Fix compilation of natpmp-helper on non-windows
...
Fixes a small oversight in 5dbfb1b3e0
.
2011-12-10 03:25:40 +01:00
Nick Mathewson
b7519dce98
Merge branch 'bug4655-squashed'
2011-12-09 11:29:03 -05:00
Robert Ransom
59b5379424
Remove comment complaining that we try to attach all streams to circs
...
It's inefficient, but the more efficient solution (only try to attach
streams aiming for this HS) would require far more complexity for a gain
that should be tiny.
2011-12-09 11:28:42 -05:00
Robert Ransom
832bfc3c46
Clear stream-isolation state on rend circs if needed to attach streams
...
Fixes bug 4655; bugfix on 0.2.3.3-alpha.
2011-12-09 11:28:42 -05:00
Robert Ransom
7b6b2d5fb8
Refactor stream attachment in circuit_has_opened
...
Put the 'try attaching streams, clear isolation state if possible, retry
attaching streams' loop in its own separate function, where it belongs.
2011-12-09 11:28:33 -05:00
Roger Dingledine
7a76994d62
bump to 0.2.3.9-alpha-dev
2011-12-08 16:25:36 -05:00
Roger Dingledine
e44205ee6c
give 0.2.3.9-alpha a blurb
2011-12-08 15:52:36 -05:00
Roger Dingledine
d65f6ceee1
bump to 0.2.3.9-alpha
2011-12-08 04:53:12 -05:00
Roger Dingledine
97bd03661c
Merge remote-tracking branch 'sebastian/bug4672'
2011-12-08 04:45:59 -05:00
Roger Dingledine
ae07af564e
paint bug2474's fix a different neon color
...
this way people with 80-column logs may read more of the warning
2011-12-08 04:41:56 -05:00
Roger Dingledine
630337e762
Merge branch 'maint-0.2.2'
2011-12-08 04:40:30 -05:00
Roger Dingledine
0582746e0d
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-12-08 04:40:15 -05:00
Roger Dingledine
06b10ccdc4
fold in changes files
2011-12-08 04:38:37 -05:00
Karsten Loesing
ff2c9acbb3
Update to the December 2011 GeoIP database.
2011-12-08 09:55:44 +01:00
Sebastian Hahn
0f8026ec23
Some more check-spaces stuff
...
This re-applies a check-spaces fix that was part of
7920ea55b8
and got reverted along with the
rest of that commit in df1f72329a
.
2011-12-08 08:47:09 +01:00
Nick Mathewson
71ecfaa52f
indent; add comment
...
This re-applies 40a87c4c08
which got
accidentally reverted in 75134c6c86
.
Thanks asn for spotting this.
2011-12-08 08:45:24 +01:00
Sebastian Hahn
ee8b4b4e6e
appease check-spaces
...
This re-applies f77f9bddb8
which got
accidentally reverted in 53f535aeb8
.
Thanks asn for spotting this.
2011-12-08 08:43:32 +01:00
Nick Mathewson
00fae9a500
Remove 4312 from the changelog.
2011-12-07 21:12:26 -05:00
Nick Mathewson
8bb853b2a2
Merge remote-tracking branch 'public/revert_4312'
2011-12-07 21:12:20 -05:00
Roger Dingledine
299034edf5
clarify a debug line
2011-12-07 18:12:11 -05:00
Robert Ransom
b5a21d79d8
Add changes file for feature2553
2011-12-07 04:44:13 -08:00
Nick Mathewson
0ebcf345ce
Revert "Refactor the SSL_set_info_callback() callbacks."
...
This reverts commit 69a821ea1c
.
2011-12-06 19:49:21 -05:00
Nick Mathewson
9727d21f68
Revert "Detect renegotiation when it actually happens."
...
This reverts commit 4fd79f9def
.
2011-12-06 19:49:21 -05:00
Nick Mathewson
e09dd43ab3
Revert "Detect and deny excess renegotiations attempts."
...
This reverts commit ecd239e3b5
.
2011-12-06 19:49:21 -05:00