user/ioerror/tor, branch natpmp Jake's tor repository Merge remote branch 'origin/master' into upnp 2010-06-06T15:17:44+00:00 Steven Murdoch Steven.Murdoch@cl.cam.ac.uk 2010-06-06T15:17:44+00:00 bcfdb16350cf1ed575a4fcfd1e8c4a0833ec104b Conflicts: configure.in src/tools/Makefile.am 
Conflicts:
	configure.in
	src/tools/Makefile.am
Don't cannibalize one-hop circuits 2010-06-04T19:04:08+00:00 Sebastian Hahn sebastian@torproject.org 2010-03-01T21:26:44+00:00 faf51fa52a7462e356927ac521ff4e6ee0703d7c In rare cases, we could cannibalize a one-hop circuit, ending up with a two-hop circuit. This circuit would not be actually used, but we should prevent its creation in the first place. Thanks to outofwords and swissknife for helping to analyse this. 
In rare cases, we could cannibalize a one-hop circuit, ending up
with a two-hop circuit. This circuit would not be actually used,
but we should prevent its creation in the first place.

Thanks to outofwords and swissknife for helping to analyse this.
Let bridge users use the non-primary address of a multi-homed bridge 2010-06-04T00:29:29+00:00 Roger Dingledine arma@torproject.org 2010-06-04T00:29:29+00:00 7e300cbba36a0716b8d4ca6373ffbe372fca9713 






Clean up "Address" documentation even harder.
2010-06-01T14:53:32+00:00

Nick Mathewson
nickm@torproject.org

2010-06-01T14:53:32+00:00

2eec9ea4e8a176933813e202c5a022a6e8c97d4f












Merge commit 'sebastian/bug1381'
2010-06-01T14:36:50+00:00

Nick Mathewson
nickm@torproject.org

2010-06-01T14:36:50+00:00

d4fa302646d78b58b1a6086e3f221d237a336c7b












Make pointer types correct in WinCE patch
2010-05-24T16:30:19+00:00

Nick Mathewson
nickm@torproject.org

2010-05-24T16:30:19+00:00

312f4ee410de718aaf20030d22a93f1c258faa37












Merge branch 'port_to_wince'
2010-05-24T16:17:43+00:00

Nick Mathewson
nickm@torproject.org

2010-05-24T16:17:43+00:00

2dce01982a46ee2558dd7a8fb5f8ac1b86d900bf












Add 'changes' file for Windows CE port
2010-05-24T15:46:54+00:00

Nick Mathewson
nickm@torproject.org

2010-05-21T02:59:48+00:00

7dcf88e69bdb3786ebac90f2609b9e190b279a4f












moved wince related includes and defs to compat.h where possible, removed unused/redundant wince includes
2010-05-24T15:46:54+00:00

valerino
valerino@te4i.com

2010-05-22T01:02:32+00:00

076063ca90cc784363127e24a83e38bd54b0e003












Port Tor to work on Windows CE
2010-05-24T15:46:45+00:00

valerino
valerino@te4i.com

2010-05-21T02:53:39+00:00

8d31141ccbdbeee9589d04ea99819af7aa35193b

Most of the changes here are switches to use APIs available on Windows
CE.  The most pervasive change is that Windows CE only provides the
wide-character ("FooW") variants of most of the windows function, and
doesn't support the older ASCII verions at all.

This patch will require use of the wcecompat library to get working
versions of the posix-style fd-based file IO functions.

[commit message by nickm]





Most of the changes here are switches to use APIs available on Windows
CE.  The most pervasive change is that Windows CE only provides the
wide-character ("FooW") variants of most of the windows function, and
doesn't support the older ASCII verions at all.

This patch will require use of the wcecompat library to get working
versions of the posix-style fd-based file IO functions.

[commit message by nickm]