[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm at torproject.org]

commit 0f47507fe2a695357b97f1037565b8c79fc797a8
Merge: c5bb554e7 c3ea1ccf0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 31 14:18:52 2017 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

 src/or/hs_descriptor.h | 1 -
 1 file changed, 1 deletion(-)