aboutsummaryrefslogtreecommitdiff
path: root/src/or/config_codedigest.c
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2009-09-03 15:19:37 +0200
committerPeter Palfrader <peter@palfrader.org>2009-09-03 15:19:37 +0200
commitb440a4d9369c4a6c4501b289f2e6ff089ba9a519 (patch)
tree180932fa558b2fab3d984b0d64210bf8d1207179 /src/or/config_codedigest.c
parent58ccdfccefb467fe453ec65e1cea90a6e7f729af (diff)
parent2bf59689a223fa026a2d2919f455ce100fe43480 (diff)
downloadtor-b440a4d9369c4a6c4501b289f2e6ff089ba9a519.tar
tor-b440a4d9369c4a6c4501b289f2e6ff089ba9a519.tar.gz
Merge branch 'debian-merge' into debian
* debian-merge: (190 commits) Forward port patches/06_add_compile_time_defaults.dpatch Forward port patches/03_tor_manpage_in_section_8.dpatch New upstream version HiddenServiceVersion must be set to 2 currently. put karsten's changelog in the right place When Tor fails to parse a descriptor of any kind, dump it to disk. update fetch-all with dir auth changelog and spec changes for the .exit fix bump to 0.2.2.1-alpha typos in dir-spec mark off a done proposal clean up the changelog for 0.2.2.1-alpha A changelog entry and a bit more documentation for socks-client Clean up a couple of style issues in the socks-client branch. new proposals: params in consensus, and lower circwindow Add some fixes after discussion with Nick. Refactor geoip_get_dirreq_history() some more. Fix a memory leak in summarizing directory request timing. Add the first 8 bytes of the git commit digest to our versions. autoconf 2.59 appears not to support AC_PROG_SED ...
Diffstat (limited to 'src/or/config_codedigest.c')
-rw-r--r--src/or/config_codedigest.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/or/config_codedigest.c b/src/or/config_codedigest.c
new file mode 100644
index 000000000..be9eaa331
--- /dev/null
+++ b/src/or/config_codedigest.c
@@ -0,0 +1,11 @@
+
+const char *tor_get_digests(void);
+
+const char *
+tor_get_digests(void)
+{
+ return ""
+#include "or_sha1.i"
+ ;
+}
+