diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-11-04 21:44:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-04 21:44:31 -0500 |
| commit | 626a8b60d7752f38e6587bed9b614c6d039dd9f7 (patch) | |
| tree | 227f93749508620dc346d2828ade36f47e123517 /changes | |
| parent | e5ca5040a56b74f3d0de82d74946f0d9c7d44cc3 (diff) | |
| parent | ffddd4de2a69a896be3886b8f48a218a70babbcc (diff) | |
| download | tor-626a8b60d7752f38e6587bed9b614c6d039dd9f7.tar.gz tor-626a8b60d7752f38e6587bed9b614c6d039dd9f7.zip | |
Merge remote-tracking branch 'linus/bug5053-bug5055'
Conflicts:
src/or/geoip.c
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/5053 | 4 | ||||
| -rw-r--r-- | changes/5055 | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/changes/5053 b/changes/5053 new file mode 100644 index 0000000000..c695f3ca9f --- /dev/null +++ b/changes/5053 @@ -0,0 +1,4 @@ + o Minor features (IPv6): + - Bridge clients connecting over IPv6 are now counted in bridge + statistics. Implementation by shkoo, addressing ticket 5053. + Included in 0.2.3.14-alpha. diff --git a/changes/5055 b/changes/5055 new file mode 100644 index 0000000000..d51fef4cf8 --- /dev/null +++ b/changes/5055 @@ -0,0 +1,9 @@ + o Minor features (IPv6): + - Add GeoIP database for IPv6 addresses and use it. The new config + option is GeoIPv6File. + Bridge clients connecting over IPv6 are now counted in bridge + statistics. Bridge statistics files now list "bridge-ip-versions" + and extra-info documents list "geoip6-db-digest". + The control protocol has been extended to support more IPv6 + ("CLIENTS_SEEN" and "ip-to-country"). + Initial implementation by shkoo, addressing ticket 5055. |