commit 72657005d5b0d88561bbd76f3088bfdc06f495be Merge: 54be496 95ac54a Author: Tomás Touceda chiiph@torproject.org Date: Fri Aug 3 21:35:43 2012 -0300

Merge remote-tracking branch 'feroze/hiddenservice'

hiddenservice/containerWidget.ui | 171 +++++++++++++++++++++++++++++++++++++ hiddenservice/customWidget.ui | 175 ++++++++++++++++++++++++++++++++++++++ hiddenservice/hiddenservice.js | 159 ++++++++++++++++++++++++++++++++++ hiddenservice/hswidget.js | 107 +++++++++++++++++++++++ hiddenservice/info.xml | 12 +++ 5 files changed, 624 insertions(+), 0 deletions(-)