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

[nickm@xxxxxxxxxxxxxx]

commit 7a1a0a4cd7d8ccdc5c9a327762f736a4e8d0d6a9
Merge: cf7aa7b aeb38bb
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Feb 23 11:33:07 2015 -0500

    Merge remote-tracking branch 'public/bug14988_025'

 changes/bug14988       |    4 ++++
 src/common/backtrace.c |    1 +
 2 files changed, 5 insertions(+)

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