Nick Mathewson 93be3a8822 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 ...

Conflicts:
	src/or/routerlist.c

2012-08-03 12:04:11 -04:00

..

bug6043

changelog for bug6043

2012-07-31 11:49:20 -04:00

bug6218

Fix port range in parse_port_range().

2012-07-06 08:02:14 -04:00

bug6271

Fix a bug handling SENDME cells on nonexistent streams.

2012-07-06 07:29:54 -04:00

bug6274

Better handling of server managed proxies when Tor is not a relay.

2012-07-18 20:01:02 +02:00

bug6274_2

Better handling of server managed proxies when Tor is not a relay.

2012-07-18 20:01:02 +02:00

bug6296

On windows, ENOBUFS starts with WSA. #6296. Fix on 0.2.18-rc

2012-07-05 05:01:00 -04:00

bug6377

Allow TestingTorNetwork when alternate dir and bridge authorities are set.

2012-07-17 09:35:38 -04:00

bug6387

Improve Alternate*Authority docs. Bug 6387.

2012-07-16 11:21:20 -04:00

bug6397

Refer to the correct variable in a loop when parsing entry guard state

2012-07-16 11:49:45 -04:00

bug6436

changes file for bug 6436.

2012-07-20 09:50:19 -04:00

bug6480

Avoid hard (impossible?)-to-trigger double-free in dns_resolve()

2012-07-31 17:19:17 -04:00

bug6490

Warn when accounting is used in a way likely to link hidden services

2012-07-31 10:28:16 -04:00

bug6500

Fix some manpage typos

2012-07-31 10:16:03 -04:00

bug6530

Clarify security impact of bug 6530

2012-08-03 11:16:13 -04:00

cov709056

Coverity 709056: Check return value on fputs in tor-gencert

2012-07-16 11:38:39 -04:00

pathsel-BUGGY-a

Try to clarify impact of bug 6537

2012-08-03 11:54:11 -04:00

port_doc

Improve message on spurious SOCKSListenAddress

2012-07-17 12:02:55 -04:00

revert-geoip-may2012

Revert to the May 2012 geoip db

2012-07-06 16:29:51 -04:00

smartlist_foreach

Tweaks to 6400 changes file and docs as suggested by arma

2012-07-18 10:12:19 -04:00