[tor-commits] [tor/master] Merge branch 'bug18626_027'

[nickm@xxxxxxxxxxxxxx]

commit 049445bca33e8578757639fc8a236540fd0fd154
Merge: d5f50cb db13527
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Mar 25 16:28:33 2016 -0400

    Merge branch 'bug18626_027'

 changes/bug18626 | 5 +++++
 configure.ac     | 9 ++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

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