/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2016-06-23 19:49:21 UTC
  • mfrom: (860 trunk)
  • mto: This revision was merged to the branch mainline in revision 861.
  • Revision ID: teddy@recompile.se-20160623194921-5bgaecm8us764lnb
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
114
114
if sys.version_info.major == 2:
115
115
    str = unicode
116
116
 
117
 
version = "1.7.10"
 
117
version = "1.7.9"
118
118
stored_state_file = "clients.pickle"
119
119
 
120
120
logger = logging.getLogger()