diff options
author | Nick Mathewson <nickm@torproject.org> | 2014-09-01 16:23:34 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2014-09-01 16:23:34 -0400 |
commit | 67c0ad54263be7fb742a8d499f97f5908f9ec970 (patch) | |
tree | 6cdbe41507e46079b6c1bc57ccd3de20c9398c8d /changes | |
parent | 87f9c51f6423230c2b6f7dfbd1c76975a39aece0 (diff) | |
parent | 8139db372528ca02cd572f3f7848e9d174a9b12e (diff) | |
download | tor-67c0ad54263be7fb742a8d499f97f5908f9ec970.tar.gz tor-67c0ad54263be7fb742a8d499f97f5908f9ec970.zip |
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'changes')
-rw-r--r-- | changes/bug12878 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/changes/bug12878 b/changes/bug12878 new file mode 100644 index 0000000000..a05fc446b9 --- /dev/null +++ b/changes/bug12878 @@ -0,0 +1,3 @@ + o Documentation: + - Document 'reject6' and 'accept6' ExitPolicy entries. Resolves + ticket 12878. |