summaryrefslogtreecommitdiff
path: root/bufferevent_ratelim.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-02-10 17:33:50 -0500
committerNick Mathewson <nickm@torproject.org>2012-02-10 17:33:50 -0500
commit539466e568ab7b676eece340b43ef98cae38c97a (patch)
treeb10c11fb020560728f149b60707cb605f4db908b /bufferevent_ratelim.c
parente465623a9c5ebc4bc85b7011c25d557a24a677d0 (diff)
parente49e2891292ee84e08c319bc5031fe607efc4245 (diff)
downloadlibevent-539466e568ab7b676eece340b43ef98cae38c97a.tar.gz
Merge remote-tracking branch 'origin/patches-2.0'
Conflicts: Makefile.am WIN32-Code/event2/event-config.h configure.in
Diffstat (limited to 'bufferevent_ratelim.c')
-rw-r--r--bufferevent_ratelim.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bufferevent_ratelim.c b/bufferevent_ratelim.c
index 44d18129..40586473 100644
--- a/bufferevent_ratelim.c
+++ b/bufferevent_ratelim.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
* Copyright (c) 2002-2006 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
*