Merge remote-tracking branch 'origin/patches-2.0'

This commit is contained in:
Nick Mathewson 2014-08-18 10:14:29 -04:00
commit 571295bdf8

3
.gitignore vendored
View File

@ -41,6 +41,8 @@ TAGS
libevent.pc
libevent_pthreads.pc
libevent_openssl.pc
*.log
*.trs
## The initial / makes these files only get ignored in particular directories.
/autom4te.cache
@ -97,6 +99,7 @@ libevent_openssl.pc
/test/test-closed
/test/test-init
/test/test-ratelim
/test/test-script.sh
/test/test-time
/test/test-weof
/test/test-changelist