commit 27039cbc26ff6a115ed89cf4f0f985c31b2bb9e6 Merge: 9f5cb52 f6a3d21 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Nov 6 20:32:16 2016 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 src/or/protover.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)