diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-19 11:43:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-19 11:43:41 -0500 |
| commit | 1053af0b9c4127873034a935ce3382940696e693 (patch) | |
| tree | 0ddf532fac615a4a7dd554b09ca1d6e41623d80a /changes/bug7555 | |
| parent | 63765399eb844adfa877a288e655eb281ac8c988 (diff) | |
| parent | 758d77130c654bcf71ba28a3ba75bd8569efc985 (diff) | |
| download | tor-1053af0b9c4127873034a935ce3382940696e693.tar.gz tor-1053af0b9c4127873034a935ce3382940696e693.zip | |
Merge branch 'bug7555_v2_squashed'
Conflicts:
src/or/connection_edge.c
Diffstat (limited to 'changes/bug7555')
| -rw-r--r-- | changes/bug7555 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug7555 b/changes/bug7555 new file mode 100644 index 0000000000..a43ff739cb --- /dev/null +++ b/changes/bug7555 @@ -0,0 +1,5 @@ + o Major bugfixes (client): + - Allow MapAddress and AutomapHostsOnResolve to work together when an + address is mapped into another address type that must be + automapped at resolve time. Fixes bug 7555; bugfix on + 0.2.0.1-alpha. |