commit f4d7a7527f63355365289fc68382f0a32f027094 Merge: 5fde2c254 8013e3e8b Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 29 15:57:30 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug28202 | 4 ++++ src/or/parsecommon.c | 3 +-- src/or/routerparse.c | 7 +++---- 3 files changed, 8 insertions(+), 6 deletions(-)