summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-28 13:54:12 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-28 13:54:12 -0400
commit315667c4483bdf6a7b1670051ae4a7a78bba1a55 (patch)
treec4ffbef0c2cecc982349a412b43ab91661928d1e
parent723f0487e9bf19a70f50aae6a3f570a4dfa9bb06 (diff)
parent75c6fdd28693aff7a61402a3c9f3d5eb7a24babb (diff)
downloadtor-315667c4483bdf6a7b1670051ae4a7a78bba1a55.tar.gz
tor-315667c4483bdf6a7b1670051ae4a7a78bba1a55.zip
Merge branch 'maint-0.3.0' into release-0.3.0
-rw-r--r--src/or/directory.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/or/directory.h b/src/or/directory.h
index 3d430f485a..1459c3bbdb 100644
--- a/src/or/directory.h
+++ b/src/or/directory.h
@@ -12,7 +12,6 @@
#ifndef TOR_DIRECTORY_H
#define TOR_DIRECTORY_H
-
int directories_have_accepted_server_descriptor(void);
void directory_post_to_dirservers(uint8_t dir_purpose, uint8_t router_purpose,
dirinfo_type_t type, const char *payload,