tor

commit f9aed40156f5a85b35877a086a0a420cbd2fafcb
parent 2b6f24665215808ed5c3e366371eaf65f917df8d
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 31 Oct 2017 14:18:52 -0400

Merge branch 'maint-0.3.2'

Diffstat:
M
src/or/hs_descriptor.h
 | 
1
-

1 file changed, 0 insertions(+), 1 deletion(-)
diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h
@@ -267,7 +267,6 @@ MOCK_DECL(STATIC size_t, decrypt_desc_layer,(const hs_descriptor_t *desc,
                                              int is_superencrypted_layer,
                                              char **decrypted_out));
 
-
 #endif /* defined(HS_DESCRIPTOR_PRIVATE) */
 
 #endif /* !defined(TOR_HS_DESCRIPTOR_H) */