diff options
| author | teor <teor2345@gmail.com> | 2015-01-10 17:20:06 +1100 |
|---|---|---|
| committer | teor <teor2345@gmail.com> | 2015-01-10 17:20:06 +1100 |
| commit | f8ffb57bc4430ff9bbd7560eecdda4284b2799ba (patch) | |
| tree | 7b73b0bf39d756c31bb62dbcd3c239864a6a46c8 /src/or/connection_or.h | |
| parent | debd7862bb6d641c13fe4ee019da633c683d740e (diff) | |
| parent | 33df3e37ffecfed309a1a0f210a96620c0ebb837 (diff) | |
| download | tor-f8ffb57bc4430ff9bbd7560eecdda4284b2799ba.tar.gz tor-f8ffb57bc4430ff9bbd7560eecdda4284b2799ba.zip | |
Merge branch 'master' of https://git.torproject.org/tor into bug13111-empty-key-files-fn-empty
Conflicts:
src/or/connection_edge.c
Merged in favour of origin.
Diffstat (limited to 'src/or/connection_or.h')
| -rw-r--r-- | src/or/connection_or.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection_or.h b/src/or/connection_or.h index b82896e26d..fc261c6bac 100644 --- a/src/or/connection_or.h +++ b/src/or/connection_or.h @@ -1,7 +1,7 @@ /* Copyright (c) 2001 Matej Pfajfar. * Copyright (c) 2001-2004, Roger Dingledine. * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2014, The Tor Project, Inc. */ + * Copyright (c) 2007-2015, The Tor Project, Inc. */ /* See LICENSE for licensing information */ /** |