torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Browse Source 
Conflicts:
	src/common/test.h
	src/or/test.c
This commit is contained in:
Nick Mathewson
2011-01-03 11:51:17 -05:00
parent e895919b17 1a07348a50
commit f1de329e78
68 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/tor-gencert.c
+1 -1
View File
@@ -1,4 +1,4 @@
/* Copyright (c) 2007-2010 The Tor Project, Inc. */
/* Copyright (c) 2007-2011, The Tor Project, Inc. */
/* See LICENSE for licensing information */
#include "orconfig.h"
src/tools/tor-resolve.c
+1 -1
View File
@@ -1,5 +1,5 @@
/* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
* Copyright (c) 2007-2010, The Tor Project, Inc.
* Copyright (c) 2007-2011, The Tor Project, Inc.
*/
/* See LICENSE for licensing information */