diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-30 14:10:22 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-30 14:10:22 -0500 |
| commit | 3b88b638264011158d27d5b451fd07d16f60e16b (patch) | |
| tree | 3af8591550471211fd0ee0a20f9602c4d761a7ce /changes | |
| parent | 60b41cd435c0acef274209a2a9b494b5f42964f6 (diff) | |
| parent | e8d598c4acc55b655f2e49566bf8802d7d6524ba (diff) | |
| download | tor-3b88b638264011158d27d5b451fd07d16f60e16b.tar.gz tor-3b88b638264011158d27d5b451fd07d16f60e16b.zip | |
Merge branch 'bug933_nm_rebased_v2'
Conflicts:
src/test/test.c
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug933 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug933 b/changes/bug933 new file mode 100644 index 0000000000..b646858202 --- /dev/null +++ b/changes/bug933 @@ -0,0 +1,4 @@ + o Minor features: + - Allow MapAddress directives to specify matches against super-domains, + as in 'MapAddress *.torproject.org *.torproject.org.torserver.exit'. + Implements issue 933. |