[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

[nickm at torproject.org]

commit 49c83dd21a7fe0432ad78061f3b41f4a5919340d
Merge: 249f3a1 ff5eb7f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 17 11:06:52 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/bug18286         |  5 +++--
 changes/bug18460         |  4 ++--
 changes/bug18481         |  2 +-
 changes/bug18729         |  2 +-
 changes/bug18816         |  2 +-
 changes/bug18921         |  2 +-
 changes/bug18929         |  2 +-
 changes/bug18943         |  2 +-
 changes/bug19003         |  2 +-
 changes/fallbacks-201604 | 16 ++++++++--------
 changes/feature18483     |  2 +-
 changes/geoip-april2016  |  2 +-
 changes/geoip-may2016    |  2 +-
 13 files changed, 23 insertions(+), 22 deletions(-)