Skip to content
This repository
Browse code

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

Conflicts:
	Makefile.am
	WIN32-Code/event2/event-config.h
	configure.in
  • Loading branch information...
commit 539466e568ab7b676eece340b43ef98cae38c97a 2 parents e465623 + e49e289
Nick Mathewson authored

Showing 120 changed files with 296 additions and 129 deletions. Show diff stats Hide diff stats

  1. +1 1  LICENSE
  2. +9 0 Makefile.am
  3. +6 0 WIN32-Code/event2/event-config.h
  4. +1 0  arc4random.c
  5. +1 1  buffer.c
  6. +1 1  buffer_iocp.c
  7. +1 1  bufferevent-internal.h
  8. +1 1  bufferevent.c
  9. +1 1  bufferevent_async.c
  10. +1 1  bufferevent_filter.c
  11. +1 1  bufferevent_openssl.c
  12. +1 1  bufferevent_pair.c
  13. +1 1  bufferevent_ratelim.c
  14. +1 1  bufferevent_sock.c
  15. +1 1  changelist-internal.h
  16. +7 2 configure.in
  17. +1 1  defer-internal.h
  18. +1 1  devpoll.c
  19. +1 1  epoll.c
  20. +1 1  epoll_sub.c
  21. +1 1  evbuffer-internal.h
  22. +25 11 evdns.c
  23. +1 1  evdns.h
  24. +1 1  event-internal.h
  25. +1 1  event.c
  26. +1 1  event.h
  27. +1 1  event_iocp.c
  28. +2 1  event_rpcgen.py
  29. +1 1  event_tagging.c
  30. +1 1  evhttp.h
  31. +1 1  evmap-internal.h
  32. +1 1  evmap.c
  33. +3 0  evport.c
  34. +1 1  evrpc-internal.h
  35. +1 1  evrpc.c
  36. +1 1  evrpc.h
  37. +1 1  evsignal-internal.h
  38. +1 1  evthread-internal.h
  39. +1 1  evthread.c
  40. +1 1  evthread_pthread.c
  41. +1 1  evthread_win32.c
  42. +1 1  evutil.c
  43. +1 1  evutil.h
  44. +1 1  evutil_rand.c
  45. +2 2 ht-internal.h
  46. +1 1  http-internal.h
  47. +1 1  http.c
  48. +6 0 include/Makefile.am
  49. +1 1  include/event2/buffer.h
  50. +1 1  include/event2/buffer_compat.h
  51. +1 1  include/event2/bufferevent.h
  52. +1 1  include/event2/bufferevent_compat.h
  53. +1 1  include/event2/bufferevent_ssl.h
  54. +1 1  include/event2/bufferevent_struct.h
  55. +1 1  include/event2/dns.h
  56. +1 1  include/event2/dns_compat.h
  57. +1 1  include/event2/dns_struct.h
  58. +1 1  include/event2/event.h
  59. +1 1  include/event2/event_compat.h
  60. +1 1  include/event2/event_struct.h
  61. +1 1  include/event2/http.h
  62. +1 1  include/event2/http_compat.h
  63. +1 1  include/event2/http_struct.h
  64. +1 1  include/event2/keyvalq_struct.h
  65. +1 1  include/event2/listener.h
  66. +1 1  include/event2/rpc.h
  67. +1 1  include/event2/rpc_compat.h
  68. +1 1  include/event2/rpc_struct.h
  69. +1 1  include/event2/tag.h
  70. +1 1  include/event2/tag_compat.h
  71. +1 1  include/event2/thread.h
  72. +1 1  include/event2/util.h
  73. +1 1  iocp-internal.h
  74. +1 1  ipv6-internal.h
  75. +1 1  kqueue.c
  76. +1 1  listener.c
  77. +1 1  log-internal.h
  78. +1 1  log.c
  79. +1 1  minheap-internal.h
  80. +1 1  mm-internal.h
  81. +1 1  poll.c
  82. +1 1  ratelim-internal.h
  83. +6 0 sample/Makefile.am
  84. +1 1  select.c
  85. +1 1  signal.c
  86. +6 0 test/Makefile.am
  87. +1 1  test/bench.c
  88. +1 1  test/bench_cascade.c
  89. +1 1  test/bench_http.c
  90. +1 1  test/bench_httpclient.c
  91. +1 1  test/regress.c
  92. +1 1  test/regress.h
  93. +1 1  test/regress_buffer.c
  94. +1 1  test/regress_bufferevent.c
  95. +1 1  test/regress_dns.c
  96. +1 1  test/regress_et.c
  97. +1 1  test/regress_http.c
  98. +1 1  test/regress_iocp.c
  99. +1 1  test/regress_listener.c
  100. +1 1  test/regress_main.c
  101. +1 1  test/regress_minheap.c
  102. +1 1  test/regress_rpc.c
  103. +1 1  test/regress_ssl.c
  104. +1 1  test/regress_testutils.c
  105. +1 1  test/regress_testutils.h
  106. +1 1  test/regress_thread.c
  107. +1 1  test/regress_util.c
  108. +1 1  test/regress_zlib.c
  109. +23 1 test/test-changelist.c
  110. +24 2 test/test-eof.c
  111. +24 2 test/test-init.c
  112. +1 1  test/test-ratelim.c
  113. +24 2 test/test-time.c
  114. +24 2 test/test-weof.c
  115. +1 1  test/tinytest.c
  116. +1 1  test/tinytest.h
  117. +1 1  test/tinytest_demo.c
  118. +1 1  test/tinytest_macros.h
  119. +1 1  util-internal.h
  120. +1 1  win32select.c
2  LICENSE
@@ -3,7 +3,7 @@ as the 3-clause (or "modified") BSD license:
3 3
4 4 ==============================
5 5 Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
6   -Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  6 +Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
7 7
8 8 Redistribution and use in source and binary forms, with or without
9 9 modification, are permitted provided that the following conditions
9 Makefile.am
... ... @@ -1,3 +1,9 @@
  1 +# Makefile.am for libevent
  2 +# Copyright 2000-2007 Niels Provos
  3 +# Copyright 2007-2012 Niels Provos and Nick Mathewson
  4 +#
  5 +# See LICENSE for copying information.
  6 +
1 7 # 'foreign' means that we're not enforcing GNU package rules strictly.
2 8 # '1.7' means that we need automake 1.7 or later (and we do).
3 9 AUTOMAKE_OPTIONS = foreign 1.7
@@ -49,6 +55,9 @@ VERSION_INFO = 1:0:0
49 55 # 2.0.12-stable-- 2.0 6:1:1 (No ABI change)
50 56 # 2.0.13-stable-- 2.0 6:2:1 (No ABI change)
51 57 # 2.0.14-stable-- 2.0 6:3:1 (No ABI change)
  58 +# 2.0.15-stable-- 2.0 6:3:1 (Forgot to update :( )
  59 +# 2.0.16-stable-- 2.0 6:4:1 (No ABI change)
  60 +# 2.0.17-stable-- 2.0 6:5:1 (No ABI change)
52 61 #
53 62 # For Libevent 2.1:
54 63 # 2.1.1-alpha -- 2.1 1:0:0
6 WIN32-Code/event2/event-config.h
@@ -334,7 +334,13 @@
334 334 #define _EVENT_TIME_WITH_SYS_TIME 1
335 335
336 336 /* Version number of package */
  337 +<<<<<<< HEAD
337 338 #define _EVENT_VERSION "2.1.0-alpha-dev"
  339 +||||||| merged common ancestors
  340 +#define _EVENT_VERSION "2.0.16-stable-dev"
  341 +=======
  342 +#define _EVENT_VERSION "2.0.17-stable"
  343 +>>>>>>> origin/patches-2.0
338 344
339 345 /* Define to appropriate substitue if compiler doesnt have __func__ */
340 346 #define _EVENT___func__ __FUNCTION__
1  arc4random.c
... ... @@ -1,6 +1,7 @@
1 1 /* Portable arc4random.c based on arc4random.c from OpenBSD.
2 2 * Portable version by Chris Davis, adapted for Libevent by Nick Mathewson
3 3 * Copyright (c) 2010 Chris Davis, Niels Provos, and Nick Mathewson
  4 + * Copyright (c) 2010-2012 Niels Provos and Nick Mathewson
4 5 *
5 6 * Note that in Libevent, this file isn't compiled directly. Instead,
6 7 * it's included from evutil_rand.c
2  buffer.c
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2002-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  buffer_iocp.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  bufferevent-internal.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2008-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2008-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  bufferevent.c
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2002-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos, Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos, Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  bufferevent_async.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * All rights reserved.
5 5 *
2  bufferevent_filter.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
3 3 * Copyright (c) 2002-2006 Niels Provos <provos@citi.umich.edu>
4 4 * All rights reserved.
5 5 *
2  bufferevent_openssl.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  bufferevent_pair.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Niels Provos, Nick Mathewson
  2 + * Copyright (c) 2009-2012 Niels Provos, Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  bufferevent_ratelim.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
3 3 * Copyright (c) 2002-2006 Niels Provos <provos@citi.umich.edu>
4 4 * All rights reserved.
5 5 *
2  bufferevent_sock.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
3 3 * Copyright (c) 2002-2006 Niels Provos <provos@citi.umich.edu>
4 4 * All rights reserved.
5 5 *
2  changelist-internal.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
9 configure.in
... ... @@ -1,5 +1,10 @@
1   -dnl configure.in for libevent
2   -dnl Dug Song <dugsong@monkey.org>
  1 +dnl Copyright 2000-2007 Niels Provos
  2 +dnl Copyright 2007-2012 Niels Provos and Nick Mathewson
  3 +dnl
  4 +dnl See LICENSE for copying information.
  5 +dnl
  6 +dnl Original version Dug Song <dugsong@monkey.org>
  7 +
3 8 AC_PREREQ(2.59)
4 9 AC_INIT(event.c)
5 10
2  defer-internal.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  devpoll.c
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright 2000-2009 Niels Provos <provos@citi.umich.edu>
3   - * Copyright 2009-2011 Niels Provos and Nick Mathewson
  3 + * Copyright 2009-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  epoll.c
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright 2007-2011 Niels Provos, Nick Mathewson
  3 + * Copyright 2007-2012 Niels Provos, Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  epoll_sub.c
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright 2003-2009 Niels Provos <provos@citi.umich.edu>
3   - * Copyright 2009-2011 Niels Provos and Nick Mathewson
  3 + * Copyright 2009-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  evbuffer-internal.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
36 evdns.c
... ... @@ -1,18 +1,32 @@
1   -/* $Id: evdns.c 6979 2006-08-04 18:31:13Z nickm $ */
2   -
3   -/* The original version of this module was written by Adam Langley; for
4   - * a history of modifications, check out the subversion logs.
  1 +/* Copyright 2006-2007 Niels Provos
  2 + * Copyright 2007-2012 Nick Mathewson and Niels Provos
5 3 *
6   - * When editing this module, try to keep it re-mergeable by Adam. Don't
7   - * reformat the whitespace, add Tor dependencies, or so on.
  4 + * Redistribution and use in source and binary forms, with or without
  5 + * modification, are permitted provided that the following conditions
  6 + * are met:
  7 + * 1. Redistributions of source code must retain the above copyright
  8 + * notice, this list of conditions and the following disclaimer.
  9 + * 2. Redistributions in binary form must reproduce the above copyright
  10 + * notice, this list of conditions and the following disclaimer in the
  11 + * documentation and/or other materials provided with the distribution.
  12 + * 3. The name of the author may not be used to endorse or promote products
  13 + * derived from this software without specific prior written permission.
8 14 *
9   - * TODO:
10   - * - Support IPv6 and PTR records.
11   - * - Replace all externally visible magic numbers with #defined constants.
12   - * - Write documentation for APIs of all external functions.
  15 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  16 + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  17 + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  18 + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  19 + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  20 + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  21 + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  22 + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  23 + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  24 + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
13 25 */
14 26
15   -/* Async DNS Library
  27 +/* Based on software by Adam Langly. Adam's original message:
  28 + *
  29 + * Async DNS Library
16 30 * Adam Langley <agl@imperialviolet.org>
17 31 * http://www.imperialviolet.org/eventdns.html
18 32 * Public Domain code
2  evdns.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  event-internal.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  event.c
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  event.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  event_iocp.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Niels Provos, Nick Mathewson
  2 + * Copyright (c) 2009-2012 Niels Provos, Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
3  event_rpcgen.py
... ... @@ -1,6 +1,7 @@
1 1 #!/usr/bin/env python
2 2 #
3   -# Copyright (c) 2005 Niels Provos <provos@citi.umich.edu>
  3 +# Copyright (c) 2005-2007 Niels Provos <provos@citi.umich.edu>
  4 +# Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 5 # All rights reserved.
5 6 #
6 7 # Generates marshaling code based on libevent.
2  event_tagging.c
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2003-2009 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  evhttp.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  evmap-internal.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  evmap.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
3  evport.c
... ... @@ -1,6 +1,9 @@
1 1 /*
2 2 * Submitted by David Pacheco (dp.spambait@gmail.com)
3 3 *
  4 + * Copyright 2006-2007 Niels Provos
  5 + * Copyright 2007-2012 Niels Provos and Nick Mathewson
  6 + *
4 7 * Redistribution and use in source and binary forms, with or without
5 8 * modification, are permitted provided that the following conditions
6 9 * are met:
2  evrpc-internal.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  evrpc.c
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  evrpc.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  evsignal-internal.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  evthread-internal.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2008-2011 Niels Provos, Nick Mathewson
  2 + * Copyright (c) 2008-2012 Niels Provos, Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  evthread.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2008-2011 Niels Provos, Nick Mathewson
  2 + * Copyright (c) 2008-2012 Niels Provos, Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  evthread_pthread.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright 2009-2011 Niels Provos and Nick Mathewson
  2 + * Copyright 2009-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  evthread_win32.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright 2009-2011 Niels Provos and Nick Mathewson
  2 + * Copyright 2009-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  evutil.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  evutil.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  evutil_rand.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
4 ht-internal.h
... ... @@ -1,6 +1,6 @@
1 1 /* Based on work Copyright 2002 Christopher Clark */
2   -/* Copyright 2005-2011 Nick Mathewson */
3   -/* Copyright 2009-2011 Niels Provos and Nick Mathewson */
  2 +/* Copyright 2005-2012 Nick Mathewson */
  3 +/* Copyright 2009-2012 Niels Provos and Nick Mathewson */
4 4 /* See license at end. */
5 5
6 6 /* Based on ideas by Christopher Clark and interfaces from Niels Provos. */
2  http-internal.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright 2001-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * This header file contains definitions for dealing with HTTP requests
6 6 * that are internal to libevent. As user of the library, you should not
2  http.c
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2002-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
6 include/Makefile.am
... ... @@ -1,3 +1,9 @@
  1 +# include/Makefile.am for libevent
  2 +# Copyright 2000-2007 Niels Provos
  3 +# Copyright 2007-2012 Niels Provos and Nick Mathewson
  4 +#
  5 +# See LICENSE for copying information.
  6 +
1 7 AUTOMAKE_OPTIONS = foreign
2 8
3 9 EVENT2_EXPORT = \
2  include/event2/buffer.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  include/event2/buffer_compat.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  include/event2/bufferevent.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/bufferevent_compat.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2007-2011 Niels Provos, Nick Mathewson
  2 + * Copyright (c) 2007-2012 Niels Provos, Nick Mathewson
3 3 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
4 4 * All rights reserved.
5 5 *
2  include/event2/bufferevent_ssl.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  include/event2/bufferevent_struct.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/dns.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/dns_compat.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/dns_struct.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/event.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/event_compat.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/event_struct.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/http.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/http_compat.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/http_struct.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/keyvalq_struct.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/listener.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/rpc.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/rpc_compat.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/rpc_struct.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/tag.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/tag_compat.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  include/event2/thread.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2008-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2008-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  include/event2/util.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  iocp-internal.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  ipv6-internal.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  kqueue.c
@@ -2,7 +2,7 @@
2 2
3 3 /*
4 4 * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu>
5   - * Copyright 2007-2011 Niels Provos and Nick Mathewson
  5 + * Copyright 2007-2012 Niels Provos and Nick Mathewson
6 6 *
7 7 * Redistribution and use in source and binary forms, with or without
8 8 * modification, are permitted provided that the following conditions
2  listener.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Niels Provos, Nick Mathewson
  2 + * Copyright (c) 2009-2012 Niels Provos, Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  log-internal.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  log.c
@@ -5,7 +5,7 @@
5 5 *
6 6 * Based on err.c, which was adapted from OpenBSD libc *err* *warn* code.
7 7 *
8   - * Copyright (c) 2005-2011 Niels Provos and Nick Mathewson
  8 + * Copyright (c) 2005-2012 Niels Provos and Nick Mathewson
9 9 *
10 10 * Copyright (c) 2000 Dug Song <dugsong@monkey.org>
11 11 *
2  minheap-internal.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Copyright (c) 2006 Maxim Yegorushkin <maxim.yegorushkin@gmail.com>
5 5 *
2  mm-internal.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  poll.c
@@ -2,7 +2,7 @@
2 2
3 3 /*
4 4 * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu>
5   - * Copyright 2007-2011 Niels Provos and Nick Mathewson
  5 + * Copyright 2007-2012 Niels Provos and Nick Mathewson
6 6 *
7 7 * Redistribution and use in source and binary forms, with or without
8 8 * modification, are permitted provided that the following conditions
2  ratelim-internal.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
6 sample/Makefile.am
... ... @@ -1,3 +1,9 @@
  1 +# sample/Makefile.am for libevent
  2 +# Copyright 2000-2007 Niels Provos
  3 +# Copyright 2007-2012 Niels Provos and Nick Mathewson
  4 +#
  5 +# See LICENSE for copying information.
  6 +
1 7 AUTOMAKE_OPTIONS = foreign no-dependencies
2 8
3 9 LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent.la
2  select.c
@@ -2,7 +2,7 @@
2 2
3 3 /*
4 4 * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu>
5   - * Copyright 2007-2011 Niels Provos and Nick Mathewson
  5 + * Copyright 2007-2012 Niels Provos and Nick Mathewson
6 6 *
7 7 * Redistribution and use in source and binary forms, with or without
8 8 * modification, are permitted provided that the following conditions
2  signal.c
@@ -2,7 +2,7 @@
2 2
3 3 /*
4 4 * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu>
5   - * Copyright 2007-2011 Niels Provos and Nick Mathewson
  5 + * Copyright 2007-2012 Niels Provos and Nick Mathewson
6 6 *
7 7 * Redistribution and use in source and binary forms, with or without
8 8 * modification, are permitted provided that the following conditions
6 test/Makefile.am
... ... @@ -1,3 +1,9 @@
  1 +# test/Makefile.am for libevent
  2 +# Copyright 2000-2007 Niels Provos
  3 +# Copyright 2007-2012 Niels Provos and Nick Mathewson
  4 +#
  5 +# See LICENSE for copying information.
  6 +
1 7 AUTOMAKE_OPTIONS = foreign
2 8
3 9 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include -I../include -DTINYTEST_LOCAL
2  test/bench.c
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright 2003-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  test/bench_cascade.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright 2007-2011 Niels Provos and Nick Mathewson
  2 + * Copyright 2007-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  test/bench_http.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright 2008-2011 Niels Provos and Nick Mathewson
  2 + * Copyright 2008-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  test/bench_httpclient.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright 2009-2011 Niels Provos and Nick Mathewson
  2 + * Copyright 2009-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  test/regress.c
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  test/regress.h
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  test/regress_buffer.c
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  test/regress_bufferevent.c
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  test/regress_dns.c
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  test/regress_et.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  test/regress_http.c
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  test/regress_iocp.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  test/regress_listener.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  test/regress_main.c
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  test/regress_minheap.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  test/regress_rpc.c
... ... @@ -1,6 +1,6 @@
1 1 /*
2 2 * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu>
3   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  3 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
2  test/regress_ssl.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  test/regress_testutils.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2010-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2010-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  test/regress_testutils.h
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2010-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2010-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  test/regress_thread.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  test/regress_util.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2009-2011 Nick Mathewson and Niels Provos
  2 + * Copyright (c) 2009-2012 Nick Mathewson and Niels Provos
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
2  test/regress_zlib.c
... ... @@ -1,5 +1,5 @@
1 1 /*
2   - * Copyright (c) 2008-2011 Niels Provos and Nick Mathewson
  2 + * Copyright (c) 2008-2012 Niels Provos and Nick Mathewson
3 3 *
4 4 * Redistribution and use in source and binary forms, with or without
5 5 * modification, are permitted provided that the following conditions
24 test/test-changelist.c
... ... @@ -1,5 +1,27 @@
1 1 /*
2   - * based on test-eof.c
  2 + * Copyright (c) 2010-2012 Niels Provos and Nick Mathewson
  3 + *
  4 + * Redistribution and use in source and binary forms, with or without
  5 + * modification, are permitted provided that the following conditions
  6 + * are met:
  7 + * 1. Redistributions of source code must retain the above copyright
  8 + * notice, this list of conditions and the following disclaimer.
  9 + * 2. Redistributions in binary form must reproduce the above copyright
  10 + * notice, this list of conditions and the following disclaimer in the
  11 + * documentation and/or other materials provided with the distribution.
  12 + * 3. The name of the author may not be used to endorse or promote products
  13 + * derived from this software without specific prior written permission.
  14 + *
  15 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR