Roger Dingledine 4f62f420fe Merge branch 'maint-0.2.2' into release-0.2.2

2012-06-05 18:38:32 -04:00

..

common

Merge remote-tracking branch 'public/bug6033' into maint-0.2.2

2012-06-04 11:33:27 -04:00

config

Update to the May 2012 GeoIP database.

2012-05-07 12:50:47 +02:00

or

Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2

2012-06-04 11:40:52 -04:00

test

Make the succeeding parse_http_time tests more obviously right

2012-05-16 12:19:56 -04:00

tools

Remove the -F option from tor-resolve.

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

win32

bump to 0.2.2.36

2012-04-24 11:20:22 -04:00

Makefile.am

…