commit c0d1ba2e9488ad7af19688d5357a2b1437b3f816
Merge: a7cd5cea6 c4b6b5738
Author: Nick Mathewson <ni...@torproject.org>
Date: Mon Oct 29 15:57:31 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug28202 | 4 ++++
src/or/parsecommon.c | 3 +--
src/or/routerparse.c | 7 +++----
3 files changed, 8 insertions(+), 6 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
