summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2012-04-13 20:11:04 -0400
committerRoger Dingledine <arma@torproject.org>2012-04-13 20:11:04 -0400
commit1614e00a219882c9aa32cef66a013d21ac34880c (patch)
treeca2d82138ede98463e9dd6d6c34d4f2f2b2782f9 /changes
parentaa0c10611beb4c275f41d0b43216750f7757b325 (diff)
parent86c4b750da6f25a0fb5291146dd60f151ae5ad7d (diff)
downloadtor-1614e00a219882c9aa32cef66a013d21ac34880c.tar.gz
tor-1614e00a219882c9aa32cef66a013d21ac34880c.zip
Merge branch 'maint-0.2.2' into release-0.2.2
Diffstat (limited to 'changes')
-rw-r--r--changes/bug55933
-rw-r--r--changes/geoip-april20123
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug5593 b/changes/bug5593
new file mode 100644
index 0000000000..358e8de60d
--- /dev/null
+++ b/changes/bug5593
@@ -0,0 +1,3 @@
+ o Minor bugfixes:
+ - When sending an HTTP/1.1 proxy request, include a Host header.
+ Fixes bug 5593; bugfix on 0.2.2.1-alpha.
diff --git a/changes/geoip-april2012 b/changes/geoip-april2012
new file mode 100644
index 0000000000..66720c6d69
--- /dev/null
+++ b/changes/geoip-april2012
@@ -0,0 +1,3 @@
+ o Minor features:
+ - Update to the April 3 2012 Maxmind GeoLite Country database.
+