commit 256cd9d8777aac7cb8fd6028ef518fdcf8ab744d Merge: 83648ef07 f406b9df0 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 18 08:13:48 2018 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

changes/bug24826_031 | 4 ++++ src/or/consdiff.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)