commit 7336d5f60d59ab5699452231ac160ca142f2894f Merge: 24f6411 52330df Author: Jacob Appelbaum jacob@appelbaum.net Date: Tue Nov 6 18:03:05 2012 -0800

Merge branch 'documentation' into pending-changes

doc/torsocks.8.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)