commit e7396c5bc6acb5d100f20b6355dcc4488ff79368 Merge: 8528f79 81f6d57 Author: Tomas Touceda <chiiph@torproject.org> Date: Sat Jun 11 03:24:26 2011 -0300 Merge branch 'bug3119_dirport' src/vidalia/config/ServerPage.cpp | 20 +++++++++++++++++++- src/vidalia/config/ServerPage.h | 6 ++++++ 2 files changed, 25 insertions(+), 1 deletions(-)