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

Conflicts:
	src/or/config.c
	src/or/dirserv.c
	src/or/or.h
This commit is contained in:
Nick Mathewson
2011-05-13 10:48:07 -04:00
13 changed files with 320 additions and 70 deletions
+14
View File
@@ -0,0 +1,14 @@
o Minor features
- The options SocksPort, ControlPort, and so on now all accept an
optional value "auto" that opens a socket on an OS-selected port.
o Minor features (controller)
- GETINFO net/listeners/(type) now returns a list of the addresses
and ports that are bound for listeners for a given connection
type. This is useful for if the user has selected SocksPort
"auto", and you need to know which port got chosen.
- There is a ControlPortWriteToFile option that tells Tor to write
its actual control port or ports to a chosen file. If the option
ControlPortFileGroupReadable is set, the file is created as
group-readable.