[or-cvs] [githax/master] Add Moxie's name and email address to the Authors file

[nickm at torproject.org]

Author: Sebastian Hahn <sebastian at torproject.org>
Date: Sat, 10 Jul 2010 03:39:19 +0200
Subject: Add Moxie's name and email address to the Authors file
Commit: 2ca42657fe77a903f82200ac47c65c1ea6a0d3d8

---
 authors.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/authors.txt b/authors.txt
index 4a69b2d..7146ccf 100644
--- a/authors.txt
+++ b/authors.txt
@@ -16,6 +16,7 @@ kaner = Christian Fromme <kaner at strace.org>
 kloesing = Karsten Loesing <karsten.loesing at gmx.net>
 mikeperry = Mike Perry <mikeperry-git at fscked.org>
 montrose = Bruce Montrose <montrose at itd.nrl.navy.mil>
+moxie = Moxie Marlinspike <moxie at thoughtcrime.org>
 nickm = Nick Mathewson <nickm at torproject.org>
 pde = Peter Eckersley <pde at eff.org>
 phobos = Andrew Lewman <andrew at torproject.org>
@@ -46,7 +47,6 @@ weasel = Peter Palfrader <peter at palfrader.org>
 # kloesing
 # le
 # mfr
-# moxie
 # pootle
 # qbi
 # renner
-- 
1.7.1