Merge remote-tracking branch 'origin/maint-0.2.3'

This commit is contained in:
Nick Mathewson
2012-07-23 12:36:04 -04:00
3 changed files with 14 additions and 1 deletions
+3
View File
@@ -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.
+3
View File
@@ -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.