commit 37e11506e5e9161a2a06b8fab9d2272a1f68b105 Merge: 65c5ad9 c02b4a1 Author: Isis Lovecruft isis@torproject.org Date: Wed May 15 22:52:53 2013 +0000

Merge remote-tracking branch 'aagbsn/master'

* Closes PR#2

scripts/init/initialize.sh | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-)