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

[nickm@xxxxxxxxxxxxxx]

commit e81896adda197b705958bcbe2b9d2c5db839b8a5
Merge: ee5c624be 9c2bc441f
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jan 31 09:50:24 2018 -0500

    Merge branch 'maint-0.3.1' into maint-0.3.2

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

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits