fold in latest changes itemtor-0.2.3.19-rc
commitd8d78f085adef4a3dd9d3c20983daa8571a44097
authorRoger Dingledine <arma@torproject.org>
Fri, 6 Jul 2012 20:37:37 +0000 (6 16:37 -0400)
committerRoger Dingledine <arma@torproject.org>
Fri, 6 Jul 2012 20:37:37 +0000 (6 16:37 -0400)
treeea06e65ae0f5eb2ab24ebcbec3fbaf73233f63f1
parentb26d59d7158c2a1883dfeba26eff820f37660ced
fold in latest changes item

also realize that there's one too many columns (now that i'm in air
conditioning and my brain has resumed working)
ChangeLog
changes/revert-geoip-may2012 [deleted file]