Roger Dingledine 9f61d8a3b3 Merge branch 'maint-0.2.1' into release-0.2.1

2011-10-26 17:13:18 -04:00

..

common

Properly refcount client_identity_key

2011-10-26 14:17:01 +02:00

config

Update to the October 2011 GeoIP database.

2011-10-13 10:13:40 -04:00

or

manually backport a5232e0c4c

2011-10-26 17:11:52 -04:00

tools

Remove the -F option from tor-resolve.

2011-10-26 17:13:04 -04:00

win32

bump to 0.2.1.30

2011-02-22 22:59:30 -05:00

Makefile.am

…