[tor-commits] [ooni-probe/master] Merge remote-tracking branch 'aagbsn/add_gitignore_for_tor_directories'

[art@xxxxxxxxxxxxxx]

commit 7a19cad7cea3fbe9c0d25674e0fb6a734c8ae3c3
Merge: 6c7754c 4b8f159
Author: Arturo Filastò <art@xxxxxxxxx>
Date:   Fri Dec 21 15:31:37 2012 +0100

    Merge remote-tracking branch 'aagbsn/add_gitignore_for_tor_directories'
    
    * aagbsn/add_gitignore_for_tor_directories:
      Add tor data directories into repo
    
    Conflicts:
    	.gitignore

 .gitignore |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --cc .gitignore
index 6bd4da2,9500420..40df4cf
--- a/.gitignore
+++ b/.gitignore
@@@ -17,8 -13,9 +17,13 @@@ ooni/lib/txtorco
  ooni/plugins/dropin.cache
  ooni/report*.yaml
  oonib/oonibackend.conf
 +oonib/data/*
 +*.resume
+ fluff/
+ pcaps/
+ report*.yaml
+ docs/build/*
+ data/*.dat
  ooniprobe.conf
 +report*.yaml
 +report*.yamloo



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits