diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-07-23 12:36:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-07-23 12:36:04 -0400 |
| commit | 20b625a0fdcf334f448bc5a49fee0d78137ed231 (patch) | |
| tree | 844d0f33993eae92f26a9a54bd1a2b3c76f87873 /changes | |
| parent | 952f562691bb0888331afae3bec47541c0531467 (diff) | |
| parent | 692005b38d3607f53d9fb605a6b4584553417ad9 (diff) | |
| download | tor-20b625a0fdcf334f448bc5a49fee0d78137ed231.tar.gz tor-20b625a0fdcf334f448bc5a49fee0d78137ed231.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug6274 | 3 | ||||
| -rw-r--r-- | changes/bug6274_2 | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/bug6274 b/changes/bug6274 new file mode 100644 index 0000000000..ad1abcde54 --- /dev/null +++ b/changes/bug6274 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Ignore ServerTransportPlugin lines when Tor is not configured as + a relay. Fixes bug 6274; bugfix on 0.2.3.6-alpha. diff --git a/changes/bug6274_2 b/changes/bug6274_2 new file mode 100644 index 0000000000..89576f9328 --- /dev/null +++ b/changes/bug6274_2 @@ -0,0 +1,3 @@ + o Minor features: + - Terminate active server managed proxies if Tor stops being a + relay. Addresses parts of bug 6274; bugfix on 0.2.3.6-alpha. |