diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-01 15:29:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-01 15:29:05 -0400 |
| commit | aaa31290431ea2cd1d1e8498dbe271eb53d2389d (patch) | |
| tree | d7ff38ffee26c5ab4571f089e8cf06d9e687a14c /src/or/routerlist.c | |
| parent | 738a8c655a1f8067b330b132164fa8879ef102c3 (diff) | |
| parent | 36e201dffc5d57d92113e1e68ad4b6a0a7b3471e (diff) | |
| download | tor-aaa31290431ea2cd1d1e8498dbe271eb53d2389d.tar.gz tor-aaa31290431ea2cd1d1e8498dbe271eb53d2389d.zip | |
Merge remote-tracking branch 'dgoulet/ticket16943_029_05-squashed'
Trivial Conflicts:
src/or/or.h
src/or/routerparse.c
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 220441fc83..6ea9d8b0d1 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1645,8 +1645,8 @@ router_digest_is_fallback_dir(const char *digest) * v3 identity key hashes to <b>digest</b>, or NULL if no such authority * is known. */ -dir_server_t * -trusteddirserver_get_by_v3_auth_digest(const char *digest) +MOCK_IMPL(dir_server_t *, +trusteddirserver_get_by_v3_auth_digest, (const char *digest)) { if (!trusted_dir_servers) return NULL; |