This reverts commit 9a88c0cd.

This reverts commit 617617e2.

This reverts commit 40a87c4c.

This reverts commit aba25a69.

This reverts commit e27a26d5.

Bugfix on 0.2.3.1, fixes the second half of bug 4637.

Fixes bug 4169; bugfix on 0.2.1.1-alpha.

Fixes bug 4532 reported by "troll_un"

Conflicts:
	src/or/connection_or.c

The conflict in src/or/connection_or.c is resolved by taking the
version in master, since e27a26d5 already fixed bug 4531 on master.
This merge just adds the changes file from 0.2.2.

Fixes bug 4531; partial backport of e27a26d5.

Fixes bug 4535; bugfix on 0.2.2.28-beta; found by "troll_un"

By convention, we say whether each bool's default is 0 or 1

Fixes 4536; found by "troll_un"

Fix on 0.2.1.5-alpha; reported by troll_un

Fixes cid 501 and 502.

Found by katmagic.  Bugfix on the #3460 branch, not yet in any release.

Remove environ declaration.
Use ORPort->value.  And it's a string.
Make tmp a char *.

Murdoch@cl.cam.ac.uk authored 13 years ago and Nick Mathewson committed 13 years ago

Otherwise, on Windows, gcc will warn about the function being unused

This avoids a warning from gcc (comparison between signed and unsigned
integer expressions [-Werror=sign-compare]), under Windows

Robert Ransom authored 13 years ago and Nick Mathewson committed 13 years ago

The client's anonymity when accessing a non-HS address in tor2web-mode
would be easily nuked by inserting an inline image with a .onion URL, so
don't even pretend to access non-HS addresses through Tor.

Robert Ransom authored 13 years ago and Nick Mathewson committed 13 years ago

The Tor2webMode torrc option is still required to run a Tor client in
'tor2web mode', but now it can't be turned on at runtime in a normal build
of Tor.  (And a tor2web build of Tor can't be used as a normal Tor client,
so we don't have to worry as much about someone distributing packages with
this particular pistol accessible to normal users.)

- Link in libws32 and libiphlpapi, needed for libnatpmp (both in
  ./configure and when compiling tor-fw-helper-natpmp.c)
- Define STATICLIB under Windows, to allow tor-fw-helper-natpmp.c to link
- Don't include arpa/inet.h which isn't present in Mingw32 and doesn't
  appear to be needed on either Windows or MacOS X