[tor-commits] [tor/master] Merge remote-tracking branch 'public/feature_13555'

[nickm@xxxxxxxxxxxxxx]

commit 0c81dfa848da160b02818771626a425cd27b86bc
Merge: 37c9c26 daab405
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Feb 11 08:42:00 2015 -0500

    Merge remote-tracking branch 'public/feature_13555'

 changes/feature_13555 |    3 +++
 src/or/dirserv.c      |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

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