Nick Mathewson de7ed2fd7a Merge commit 'origin/maint-0.2.1' ...

Conflicts:
	debian/changelog
	debian/control
	debian/patches/03_tor_manpage_in_section_8.dpatch
	debian/patches/06_add_compile_time_defaults.dpatch
	debian/rules

2010-08-04 12:37:30 -04:00

..

bug919

Bug #919: Don't rebind ports if we receive SIGHUP while hibernating.

2010-08-02 12:14:01 -04:00

bug928

Bug #928: Disallow BridgeRelay 1 and ORPort 0 configuration

2010-08-02 12:04:04 -04:00

bug1107

Bug #1107: Complain if PublishServerDescriptor receives 0 or 1 in a list

2010-08-02 12:02:06 -04:00

bug1222

Bug #1222: Clarify new circuit after sleep notice

2010-07-31 16:58:49 -04:00

bug1384

Fix a compile warning on OS X 10.6

2010-08-02 18:45:17 +02:00

bug1731

Make sure we don't warn for libevent versions like 1.4.14b-stable

2010-07-26 20:39:12 +02:00

geoip-update-august2010

Update to the August 1 2010 Maxmind GeoLite Country database.

2010-08-03 13:04:09 +02:00

makefile-var-exp

Add a changes file for Linus's makefile-var-exp branch.

2010-07-30 11:37:42 -04:00

mingw-openssl098m

Fix compilation with mingw and OpenSSL 0.9.8m+

2010-07-26 15:05:11 -04:00

nowhereland

Make "Nowhere" explicitly listable in torrc.

2010-07-31 15:00:06 -04:00

relays_as_bridges

Allow using regular relays as bridges

2010-07-31 10:24:24 +02:00

remove-debian

Remove the debian directory from the main git repository

2010-08-04 12:21:48 -04:00

split_orh

Add the new header files to noinst_HEADERS

2010-07-27 10:00:46 +02:00