[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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

commit 246765342e681ae6f8c35709f9acd9a78d7048d2
Merge: 7c3f87eb4 993e314c6
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed May 2 08:46:28 2018 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug26007 |  5 +++++
 src/or/dirserv.c | 13 +++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)




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