Merge remote-tracking branch 'origin/security/vidalia_in_its_own_user' into security...
commitc2e58cf422c7ec08c9d8c14469da8e4ffaf938cf
authorTails developers <amnesia@boum.org>
Fri, 18 Oct 2013 12:12:34 +0000 (18 12:12 +0000)
committerTails developers <amnesia@boum.org>
Fri, 18 Oct 2013 12:12:34 +0000 (18 12:12 +0000)
treec23f80d016fd2bfd8442afc8702360a7a55090ef
parent1cc70607918bdcbc883312298f10e58b7ceb56f2
parent835e5a12df6fabe8c4c9ca78fbeba4ab5cec5c9c
Merge remote-tracking branch 'origin/security/vidalia_in_its_own_user' into security/vidalia_in_its_own_user