[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm@xxxxxxxxxxxxxx]

commit 0c58627c1cb134d57bb653007d67d9c4a8119faa
Merge: 51ae5d8 e2cd600
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Mar 13 16:22:49 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug21682   | 3 +++
 src/or/confparse.c | 1 +
 2 files changed, 4 insertions(+)

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