Merge branch 'v0.8'

Conflicts:
	ChangeLog
	deps/openssl/openssl.gyp
	src/node_version.h

diff --cc AUTHORS
Simple merge

diff --cc ChangeLog
index d2ea9ef,53f0c1a..e2deb03
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,27 -1,29 +1,52 @@@
- 2012.08.15, Version 0.8.7 (Stable)
 +2012.07.20, Version 0.9.0 (Unstable)
 +
 +* punycode: update to v1.1.1 (Mathias Bynens)
 +
 +* c-ares: upgrade to 1.9.0 (Saúl Ibarra Corretgé)
 +
 +* dns: ignore rogue DNS servers reported by windows (Saúl Ibarra Corretgé)
 +
 +* unix: speed up uv_async_send() (Ben Noordhuis)
 +
 +* darwin: get cpu model correctly on mac (Xidorn Quan)
 +
 +* nextTick: Handle tick callbacks before any other I/O (isaacs)
 +
 +* Enable color customization of `util.inspect` (Pavel Lang)
 +
 +* tls: Speed and memory improvements (Fedor Indutny)
 +
 +* readline: Use one history item for reentered line (Vladimir Beloborodov)
 +
 +* Fix #3521 Make process.env more like a regular Object (isaacs)
 +
 +
+ 2012.08.22, Version 0.8.8 (Stable)
+ 
+ * V8: upgrade to 3.11.10.19
+ 
+ * npm: upgrade to 1.1.59
+ 
+ * windows: fix uninitialized memory access in uv_update_time() (Bert Belder)
+ 
+ * unix, windows: fix memory corruption in fs-poll.c (Ben Noordhuis)
+ 
+ * unix: fix integer overflow in uv_hrtime (Tim Holy)
+ 
+ * sunos: fix uv_cpu_info() on x86_64 (Ben Noordhuis)
+ 
+ * tls: update default cipher list (Ben Noordhuis)
+ 
+ * unix: Fix llvm and older gcc duplicate symbol warnings (Bert Belder)
+ 
+ * fs: fix use after free in stat watcher (Ben Noordhuis)
+ 
+ * build: Fix using manually compiled gcc on OS X (Nathan Rajlich)
+ 
+ * windows: make junctions work again (Bert Belder)
+ 
+ 
+ 2012.08.15, Version 0.8.7 (Stable), f640c5d35cba96634cd8176a525a1d876e361a61
  
  * npm: Upgrade to 1.1.49
  

diff --cc common.gypi
Simple merge

diff --cc deps/openssl/openssl.gyp
index c9dc07d,cbc0007..4bd39cd
--- 1/deps/openssl/openssl.gyp
--- 2/deps/openssl/openssl.gyp
+++ b/deps/openssl/openssl.gyp
@@@ -649,15 -650,13 +649,22 @@@
          }],
          ['target_arch=="ia32"', {
            'variables': {'openssl_config_path': 'config/piii'},
-         }, {
 +          'sources': [
 +            'openssl/crypto/bn/bn_asm.c',
 +          ]
+         }],
+         ['target_arch=="x64"', {
            'variables': {'openssl_config_path': 'config/k8'},
 -        }],
 +          'sources': [
 +            'openssl/crypto/bn/asm/x86_64-gcc.c',
 +          ]
+         }],
+         ['target_arch=="arm"', {
+           'variables': {'openssl_config_path': 'config/android'},
++          'sources': [
++            'openssl/crypto/bn/bn_asm.c',
++          ]
 +        }]
        ],
        'include_dirs': [
          '.',

diff --cc lib/child_process.js
Simple merge

diff --cc lib/net.js
Simple merge

diff --cc lib/tls.js
Simple merge